qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make.sh: config fragment support nested 

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I200b6aa12684d53e6ddddb333696423a4c351f67
This commit is contained in:
Joseph Chen 2020-07-09 16:32:06 +08:00
parent 496a6e1e02
commit 1df865f3f3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
make.sh
View File

@ -227,16 +227,12 @@ function process_args()
echo "ERROR: No configs/${ARG_BOARD}_defconfig" echo "ERROR: No configs/${ARG_BOARD}_defconfig"
exit 1 exit 1
elif [ -f configs/${ARG_BOARD}.config ]; then elif [ -f configs/${ARG_BOARD}.config ]; then
BASE_DEFCONFIG=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" configs/${ARG_BOARD}.config |tr -d '\r' | tr -d '"'` BASE1_DEFCONFIG=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" configs/${ARG_BOARD}.config |tr -d '\r' | tr -d '"'`
MAKE_CMD="make ${BASE_DEFCONFIG} ${ARG_BOARD}.config -j${JOB}" BASE0_DEFCONFIG=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" configs/${BASE1_DEFCONFIG} |tr -d '\r' | tr -d '"'`
MAKE_CMD="make ${BASE0_DEFCONFIG} ${BASE1_DEFCONFIG} ${ARG_BOARD}.config -j${JOB}"
echo "## ${MAKE_CMD}" echo "## ${MAKE_CMD}"
make ${BASE_DEFCONFIG} ${ARG_BOARD}.config ${OPTION} make ${BASE0_DEFCONFIG} ${BASE1_DEFCONFIG} ${ARG_BOARD}.config ${OPTION}
else else
BASE_DEFCONFIG=`sed -n "/CONFIG_BASE_DEFCONFIG=/s/CONFIG_BASE_DEFCONFIG=//p" configs/${ARG_BOARD}_defconfig |tr -d '\r' | tr -d '"'`
if [ "${BASE_DEFCONFIG}" == "${ARG_BOARD}_defconfig" ]; then
echo "ERROR: configs/${ARG_BOARD}_defconfig is base defconfig for other [...].config"
exit 1
fi
MAKE_CMD="make ${ARG_BOARD}_defconfig -j${JOB}" MAKE_CMD="make ${ARG_BOARD}_defconfig -j${JOB}"
echo "## ${MAKE_CMD}" echo "## ${MAKE_CMD}"
make ${ARG_BOARD}_defconfig ${OPTION} make ${ARG_BOARD}_defconfig ${OPTION}