Thanks, applied as cefb1c446d27516e7e020d28821cce20ee0cc897. Michael
[sent from post-receive hook] On Mon, 03 Aug 2020 08:29:56 +0200, Roland Hieber <[email protected]> wrote: > With <PKG>_CONF_TOOL := kconfig, KCONFIG_NOTIMESTAMP is always set by > the default prepare stage since commit 5b2c1a9375f4c697e666 (2018-11-02, > Michael Olbrich: "ptxd_make_kconfig: set KCONFIG_NOTIMESTAMP"). > > Still keep the setting in BUSYBOX_MAKE_OPT because busybox's kconfig is > not SOURCE_DATE_EPOCH aware and compiles the build timestamp into the > binary when KCONFIG_NOTIMESTAMP is not set. Add a short note there so > this commit shows up in git blame. > > Signed-off-by: Roland Hieber <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > index c143ab7f212b..f0d79f151e08 100644 > --- a/rules/barebox_mlo.make > +++ b/rules/barebox_mlo.make > @@ -34,7 +34,6 @@ BAREBOX_MLO_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > BAREBOX_MLO_PATH := PATH=$(CROSS_PATH) > -BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 > BAREBOX_MLO_CONF_TOOL := kconfig > BAREBOX_MLO_CONF_OPT := \ > V=$(PTXDIST_VERBOSE) \ > diff --git a/rules/busybox.make b/rules/busybox.make > index 57c94b6092ee..5c87c17ba4d4 100644 > --- a/rules/busybox.make > +++ b/rules/busybox.make > @@ -48,6 +48,7 @@ ifeq ($(BUSYBOX_ARCH),i386) > BUSYBOX_ARCH := x86 > endif > > +# does not build reproducibly unless we set KCONFIG_NOTIMESTAMP > BUSYBOX_MAKE_OPT := \ > KCONFIG_NOTIMESTAMP=1 \ > V=$(PTXDIST_VERBOSE) \ > diff --git a/rules/templates/template-kernel-make > b/rules/templates/template-kernel-make > index cc01e7fb7279..5274b42c2362 100644 > --- a/rules/templates/template-kernel-make > +++ b/rules/templates/template-kernel-make > @@ -36,7 +36,6 @@ KERNEL_@PACKAGE@_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > KERNEL_@PACKAGE@_PATH := PATH=$(CROSS_PATH) > -KERNEL_@PACKAGE@_ENV := KCONFIG_NOTIMESTAMP=1 > KERNEL_@PACKAGE@_SHARED_OPT := \ > -C $(KERNEL_@PACKAGE@_DIR) \ > O=$(KERNEL_@PACKAGE@_BUILD_DIR) \ > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 7454e9a0cca4..bc428b5f45f7 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -67,7 +67,7 @@ U_BOOT_TAGS_OPT := ctags cscope etags > > ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG > U_BOOT_CONF_TOOL := kconfig > -U_BOOT_CONF_ENV := KCONFIG_NOTIMESTAMP=1 $(U_BOOT_MAKE_ENV) > +U_BOOT_CONF_ENV := $(U_BOOT_MAKE_ENV) > endif > > ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
