Merge tag 'baserock-15.34'

Conflicts:
	README
	clusters/release.morph
	scripts/release-build

Change-Id: If289bcb168478405400c66717d7f33dcdde63cb6

1 files changed, 19 insertions, 11 deletions

diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
index 98e4bf33..f271a40d 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.morph
@@ -5,11 +5,11 @@ 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'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+  -i .config'
 # We have GAWK.
 - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
 
@@ -30,13 +30,19 @@ configure-commands:
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
 # General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+  set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
 - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
 - sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
@@ -58,7 +64,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 +74,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