From 859a265cba7b49b03c71fc68fdcc2c6216d92385 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 16 Oct 2013 15:12:30 +0200 Subject: [PATCH] Removing MK{GCCCMDS,BINUTILS}=yes in image scripts MKGCCCMDS=yes and MKBINUTILS=yes where added on the build command line while they should have been left to the developer's discretion. To build and install binutils and gcc do the following: $ BUILDVARS='-V MKBINUTILS=yes -V MKGCC=yes -V MKGCCCMDS=yes' \ ./releasetools/arm_sdimage.sh or $ BUILDVARS='-V MKBINUTILS=yes -V MKGCC=yes -V MKGCCCMDS=yes' \ ./releasetools/x86_hdimage.sh Change-Id: Icb46a3422f527747768fa107d14fc19ff3ac0a63 --- releasetools/arm_sdimage.sh | 5 +++-- releasetools/x86_hdimage.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/releasetools/arm_sdimage.sh b/releasetools/arm_sdimage.sh index 2966e912b..8a413402f 100755 --- a/releasetools/arm_sdimage.sh +++ b/releasetools/arm_sdimage.sh @@ -58,7 +58,8 @@ then fi if [ ! -f ${BUILDSH} ] -then echo "Please invoke me from the root source dir, where ${BUILDSH} is." +then + echo "Please invoke me from the root source dir, where ${BUILDSH} is." exit 1 fi @@ -89,7 +90,7 @@ 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 # export CPPFLAGS=${FLAG} -sh ${BUILDSH} -V SLOPPY_FLIST=yes -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution +sh ${BUILDSH} -V SLOPPY_FLIST=yes -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 06c6dc2fd..6d0f9ee63 100755 --- a/releasetools/x86_hdimage.sh +++ b/releasetools/x86_hdimage.sh @@ -50,7 +50,7 @@ mkdir -p ${IMG_DIR} ${CDFILES} # Call build.sh using a sloppy file list so we don't need to remove the installed /etc/fstag # export CPPFLAGS=${FLAG} -sh ${BUILDSH} -V SLOPPY_FLIST=yes -V MKBINUTILS=yes -V MKGCCCMDS=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution +sh ${BUILDSH} -V SLOPPY_FLIST=yes -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution if [ "x${ISOMODE}" = "x1" ] then -- 2.44.0