From 2d00147b3f80e9c0cb19673f831d6676be67eebf Mon Sep 17 00:00:00 2001 From: Koustubha Bhat Date: Tue, 10 Jun 2014 17:05:29 +0200 Subject: [PATCH] CREATE_IMAGE_ONLY option added to releasetools/x86_hdimage.sh --- releasetools/x86_hdimage.sh | 38 ++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh index 1dcef4bbd..7055a4c9c 100755 --- a/releasetools/x86_hdimage.sh +++ b/releasetools/x86_hdimage.sh @@ -10,6 +10,7 @@ set -e : ${FSTAB=${DESTDIR}/etc/fstab} : ${BUILDVARS=} : ${BUILDSH=build.sh} +: ${CREATE_IMAGE_ONLY=0} # Where the kernel & boot modules will be MODDIR=${DESTDIR}/multiboot @@ -40,22 +41,41 @@ done : ${IMG=minix_x86.img} +# +# Are we going to build the minix sources? +# + +if [ ${CREATE_IMAGE_ONLY} -eq 1 ] +then + if [ ! -d ${DESTDIR} ] + then + echo "Minix source code does'nt appear to have been built." + echo "Please try with \$CREATE_IMAGE_ONLY set to 0." + exit 1 + fi +fi + # # Artifacts from this script are stored in the IMG_DIR # rm -rf ${IMG_DIR} ${IMG} mkdir -p ${IMG_DIR} ${CDFILES} -# -# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'. -# -rm -f ${FSTAB} +if [ ${CREATE_IMAGE_ONLY} -eq 0 ] +then + echo "Going to build Minix source code..." + # + # 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} -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution -# -# Now start the build. -# -export CPPFLAGS=${FLAG} -sh ${BUILDSH} -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution +fi if [ "x${ISOMODE}" = "x1" ] then -- 2.44.0