From b12bb57943c6903ce237b1564908e0b2117d269d Mon Sep 17 00:00:00 2001 From: Kees Jongenburger Date: Mon, 25 Nov 2013 14:47:22 +0100 Subject: [PATCH] build:Remove the usage of sloppy file list. Remove the usage of sloppy files list in the build scripts to get early errors when files are added. Change-Id: Id89c1391da675c76d7511a973f7f2dcda8befbb2 --- releasetools/arm_sdimage.sh | 9 +++++++-- releasetools/x86_hdimage.sh | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh index 035ff33e4..2575bc5a7 100755 --- a/releasetools/arm_sdimage.sh +++ b/releasetools/arm_sdimage.sh @@ -87,10 +87,15 @@ cp ${RELEASETOOLSDIR}/u-boot/${U_BOOT_BIN_DIR}/u-boot.img ${IMG_DIR}/ cp ${RELEASETOOLSDIR}/u-boot/${U_BOOT_BIN_DIR}/MLO ${IMG_DIR}/ # -# Call build.sh using a sloppy file list so we don't need to remove the installed /etc/fstag +# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'. +# +rm -f ${FSTAB} + +# +# Now start the build # export CPPFLAGS=${FLAG} -sh ${BUILDSH} -V SLOPPY_FLIST=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution +sh ${BUILDSH} -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution # # This script creates a bootable image and should at some point in the future diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh index 41d0afd7d..a4aae7785 100755 --- a/releasetools/x86_hdimage.sh +++ b/releasetools/x86_hdimage.sh @@ -47,10 +47,15 @@ rm -rf ${IMG_DIR} ${IMG} mkdir -p ${IMG_DIR} ${CDFILES} # -# Call build.sh using a sloppy file list so we don't need to remove the installed /etc/fstag +# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'. +# +rm -f ${FSTAB} + +# +# Now start the build. # export CPPFLAGS=${FLAG} -sh ${BUILDSH} -V SLOPPY_FLIST=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution +sh ${BUILDSH} -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution if [ "x${ISOMODE}" = "x1" ] then -- 2.44.0