* [ptxdist] [PATCH 1/2] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments
@ 2020-07-23 9:50 Roland Hieber
2020-07-23 9:50 ` [ptxdist] [PATCH 2/2] busybox: bring back and reorder the stage separator comments Roland Hieber
2020-08-03 6:29 ` [ptxdist] [APPLIED] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Roland Hieber @ 2020-07-23 9:50 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
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 <rhi@pengutronix.de>
---
rules/barebox_mlo.make | 1 -
rules/busybox.make | 1 +
rules/templates/template-kernel-make | 1 -
rules/u-boot.make | 2 +-
4 files changed, 2 insertions(+), 3 deletions(-)
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
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] busybox: bring back and reorder the stage separator comments
2020-07-23 9:50 [ptxdist] [PATCH 1/2] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Roland Hieber
@ 2020-07-23 9:50 ` Roland Hieber
2020-08-03 6:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03 6:29 ` [ptxdist] [APPLIED] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Roland Hieber @ 2020-07-23 9:50 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Even if the default compile stage is used, its variables deserve a
recognisable header for better navigation. The BUSYBOX_INSTALL_OPT
variable belongs to the install stage, so move the Install header.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/busybox.make | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/rules/busybox.make b/rules/busybox.make
index 5c87c17ba4d4..9870414d0b32 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -48,6 +48,10 @@ ifeq ($(BUSYBOX_ARCH),i386)
BUSYBOX_ARCH := x86
endif
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
# does not build reproducibly unless we set KCONFIG_NOTIMESTAMP
BUSYBOX_MAKE_OPT := \
KCONFIG_NOTIMESTAMP=1 \
@@ -65,15 +69,15 @@ BUSYBOX_MAKE_ENV := \
$(CROSS_ENV) \
SKIP_STRIP=y
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
BUSYBOX_INSTALL_OPT := \
$(BUSYBOX_MAKE_OPT) \
CONFIG_PREFIX=$(BUSYBOX_PKGDIR)/usr \
install
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
$(STATEDIR)/busybox.install:
@$(call targetinfo)
@$(call world/install, BUSYBOX)
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] busybox: bring back and reorder the stage separator comments
2020-07-23 9:50 ` [ptxdist] [PATCH 2/2] busybox: bring back and reorder the stage separator comments Roland Hieber
@ 2020-08-03 6:29 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-08-03 6:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as b65290de7455a93db53e0c0d233ee1bd2f7ec674.
Michael
[sent from post-receive hook]
On Mon, 03 Aug 2020 08:29:57 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Even if the default compile stage is used, its variables deserve a
> recognisable header for better navigation. The BUSYBOX_INSTALL_OPT
> variable belongs to the install stage, so move the Install header.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200723095027.3673-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/busybox.make b/rules/busybox.make
> index 5c87c17ba4d4..9870414d0b32 100644
> --- a/rules/busybox.make
> +++ b/rules/busybox.make
> @@ -48,6 +48,10 @@ ifeq ($(BUSYBOX_ARCH),i386)
> BUSYBOX_ARCH := x86
> endif
>
> +# ----------------------------------------------------------------------------
> +# Compile
> +# ----------------------------------------------------------------------------
> +
> # does not build reproducibly unless we set KCONFIG_NOTIMESTAMP
> BUSYBOX_MAKE_OPT := \
> KCONFIG_NOTIMESTAMP=1 \
> @@ -65,15 +69,15 @@ BUSYBOX_MAKE_ENV := \
> $(CROSS_ENV) \
> SKIP_STRIP=y
>
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> BUSYBOX_INSTALL_OPT := \
> $(BUSYBOX_MAKE_OPT) \
> CONFIG_PREFIX=$(BUSYBOX_PKGDIR)/usr \
> install
>
> -# ----------------------------------------------------------------------------
> -# Install
> -# ----------------------------------------------------------------------------
> -
> $(STATEDIR)/busybox.install:
> @$(call targetinfo)
> @$(call world/install, BUSYBOX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments
2020-07-23 9:50 [ptxdist] [PATCH 1/2] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Roland Hieber
2020-07-23 9:50 ` [ptxdist] [PATCH 2/2] busybox: bring back and reorder the stage separator comments Roland Hieber
@ 2020-08-03 6:29 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2020-08-03 6:29 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as cefb1c446d27516e7e020d28821cce20ee0cc897.
Michael
[sent from post-receive hook]
On Mon, 03 Aug 2020 08:29:56 +0200, Roland Hieber <rhi@pengutronix.de> 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 <rhi@pengutronix.de>
> Message-Id: <20200723095027.3673-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-03 6:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-23 9:50 [ptxdist] [PATCH 1/2] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Roland Hieber
2020-07-23 9:50 ` [ptxdist] [PATCH 2/2] busybox: bring back and reorder the stage separator comments Roland Hieber
2020-08-03 6:29 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-03 6:29 ` [ptxdist] [APPLIED] rules: remove redundant KCONFIG_NOTIMESTAMP from package environments Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox