From d76980563ad45d06e014a266771cffb87e84bece Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 12 Jun 2015 15:42:46 +0000 Subject: busybox: Don't include build date in --help output I did two builds of 'busybox' on the same system, using YBD, and found that the only difference between the two artifacts was the /baserock/busybox.meta file, as this contains an 'elapsed_time' field. Change-Id: Id6d65e68286cdd47eb44ad838a15c599b91c4e8d --- strata/build-essential/busybox.morph | 6 +++--- strata/build-essential/stage2-busybox.morph | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index b5418bc0..83c05bb5 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -3,7 +3,7 @@ kind: chunk configure-commands: # Busybox's default config has everything enabled. -- make defconfig +- make defconfig KCONFIG_NOTIMESTAMP=1 - sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config - sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config @@ -57,12 +57,12 @@ configure-commands: build-commands: -- make +- make KCONFIG_NOTIMESTAMP=1 install-commands: - | if [ "$PREFIX" = /usr ]; then PREFIX=; fi && - make CONFIG_PREFIX="$DESTDIR$PREFIX" install && + make CONFIG_PREFIX="$DESTDIR$PREFIX" KCONFIG_NOTIMESTAMP=1 install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox # Set up man environment variables diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph index 98e4bf33..73803f89 100644 --- a/strata/build-essential/stage2-busybox.morph +++ b/strata/build-essential/stage2-busybox.morph @@ -5,7 +5,7 @@ configure-commands: # Explicitly setting HOSTCC is required because we have a 'gcc' earlier in # the PATH supplied by the stage2-gcc chunk, which can't execute outside of # the stage 3 staging area. -- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- defconfig +- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 defconfig # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin. - '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config' @@ -58,7 +58,7 @@ build-commands: export STAGE2_SYSROOT="$(dirname $(pwd))" export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="--sysroot=$STAGE2_SYSROOT" - make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- + make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 install-commands: # We expect to be built with a non-standard prefix in stage 2 (i.e. not @@ -68,5 +68,7 @@ install-commands: export CPPFLAGS="--sysroot=$STAGE2_SYSROOT" export LDFLAGS="--sysroot=$STAGE2_SYSROOT" make CONFIG_PREFIX="$DESTDIR$PREFIX" \ - HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- install && + HOSTCC="/usr/bin/gcc" \ + CROSS_COMPILE=$TARGET_STAGE1- \ + KCONFIG_NOTIMESTAMP=1 install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox -- cgit v1.2.1