[DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0

DistroKit Mailinglist
 help / color / mirror / Atom feed

* [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0
@ 2021-04-09 23:02 Roland Hieber
  2021-04-09 23:02 ` [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules Roland Hieber
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Roland Hieber @ 2021-04-09 23:02 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

Migrate with default settings to the new PTXdist version, which was
released today.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-mips/platformconfig   |  4 ++--
 configs/platform-rpi/platformconfig    |  5 +++--
 configs/platform-v7a/platformconfig    |  4 ++--
 configs/platform-v8a/platformconfig    |  4 ++--
 configs/platform-x86_64/platformconfig |  4 ++--
 configs/ptxconfig                      | 11 ++++++++---
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig
index f046016fd231..89123210f811 100644
--- a/configs/platform-mips/platformconfig
+++ b/configs/platform-mips/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mips"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.04.0"
 
 #
 # architecture                  
diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi/platformconfig
index 152f41c0596d..42437023857a 100644
--- a/configs/platform-rpi/platformconfig
+++ b/configs/platform-rpi/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="rpi"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.04.0"
 
 #
 # architecture                  
@@ -176,6 +176,7 @@ PTXCONF_CONSOLE_SPEED="115200"
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX=y
 PTXCONF_BAREBOX_VERSION="2020.08.1"
+# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set
 PTXCONF_BAREBOX_MD5="d57031878390cb267f6641aedffcda9f"
 PTXCONF_BAREBOX_CONFIG="barebox.config"
 PTXCONF_BAREBOX_EXTRA_ENV=y
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 98bb638b05c6..bcc21495ae4d 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.04.0"
 
 #
 # architecture                  
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index a08cf84bfc5c..aa84bea6fc74 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v8a"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.04.0"
 
 #
 # architecture                  
diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
index fecfddcf5c5b..4c7849a830fb 100644
--- a/configs/platform-x86_64/platformconfig
+++ b/configs/platform-x86_64/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="x86_64"
 PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2021.03.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2021.04.0"
 
 #
 # architecture                  
diff --git a/configs/ptxconfig b/configs/ptxconfig
index 46fc14627008..d923c093a277 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2021.03.0
+# PTXdist 2021.04.0
 #
 PTXCONF_DATAPARTITION=y
 
@@ -67,7 +67,7 @@ PTXCONF_BSP=y
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
-PTXCONF_CONFIGFILE_VERSION="2021.03.0"
+PTXCONF_CONFIGFILE_VERSION="2021.04.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -86,7 +86,6 @@ PTXCONF__ptxconfig_MAGIC__=y
 # Host Tools                    
 #
 # PTXCONF_HOST_DFU_UTIL is not set
-# PTXCONF_HOST_GENGETOPT is not set
 # PTXCONF_HOST_MFGTOOLS is not set
 # PTXCONF_HOST_OPENOCD is not set
 PTXCONF_HOST_QEMU=y
@@ -1618,6 +1617,7 @@ PTXCONF_ZSTD=y
 # PTXCONF_PYTHON3_PATH_PY is not set
 # PTXCONF_PYTHON3_PEXPECT is not set
 # PTXCONF_PYTHON3_PICKLESHARE is not set
+# PTXCONF_PYTHON3_PIP is not set
 # PTXCONF_PYTHON3_PLUGGY is not set
 # PTXCONF_PYTHON3_PLY is not set
 # PTXCONF_PYTHON3_PSUTIL is not set
@@ -1724,6 +1724,7 @@ PTXCONF_IPROUTE2_IP=y
 # PTXCONF_LIBCGI is not set
 # PTXCONF_LIBCGICC is not set
 # PTXCONF_LIBCOAP is not set
+# PTXCONF_LIBCOAP2 is not set
 # PTXCONF_LIBCURL is not set
 # PTXCONF_LIBMBIM is not set
 # PTXCONF_LIBMICROHTTPD is not set
@@ -1933,6 +1934,7 @@ PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y
 # PTXCONF_EFAX is not set
 # PTXCONF_HEIRLOOM_MAILX is not set
 # PTXCONF_IMX_UUC is not set
+# PTXCONF_LIBSERIALPORT is not set
 # PTXCONF_LIBSOCKETCAN is not set
 # PTXCONF_LRZSZ is not set
 # PTXCONF_OPEN62541 is not set
@@ -2126,6 +2128,7 @@ PTXCONF_SLANG=y
 # PTXCONF_SPARSEHASH is not set
 # PTXCONF_SQLITE is not set
 # PTXCONF_SQLITECPP is not set
+# PTXCONF_TALLOC is not set
 # PTXCONF_TCLAP is not set
 # PTXCONF_TERMCAP is not set
 # PTXCONF_TIMESCALEDB is not set
@@ -2200,6 +2203,7 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_ARM_MEMSPEED is not set
 # PTXCONF_BONNIEXX is not set
 # PTXCONF_CALIBRATOR is not set
+# PTXCONF_CATCH2 is not set
 # PTXCONF_CBENCHSUITE is not set
 # PTXCONF_CMOCKA is not set
 # PTXCONF_CPUBURN_ARM is not set
@@ -2276,6 +2280,7 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_LIBSRTP is not set
 # PTXCONF_LIBTHEORA is not set
 # PTXCONF_LIBVORBIS is not set
+# PTXCONF_LIBWACOM is not set
 # PTXCONF_LIBWEBP is not set
 # PTXCONF_LIBX11_LOCALE is not set
 # PTXCONF_LIBXKBCOMMON is not set
-- 
2.29.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules
  2021-04-09 23:02 [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Roland Hieber
@ 2021-04-09 23:02 ` Roland Hieber
  2021-04-23 10:55   ` Robert Schwebel
  2021-04-09 23:02 ` [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version Roland Hieber
  2021-04-23 10:54 ` [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Robert Schwebel
  2 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2021-04-09 23:02 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

This ports the following commits from PTXdist 2021.04.0:

    | commit a22b449946eed634f42b06b0c385b29621c6d02e
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2021-04-01 15:58:54
    |
    |     template: kernel: proper handle signed modules
    |
    |     Same as 565aabf6f36d3ed31544d882394604c4a1b13597 but for the kernel
    |     template instead of the kernel itself.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 565aabf6f36d3ed31544d882394604c4a1b13597
    | Author: Denis Osterland-Heim <denis.osterland@diehl.com>
    | Date:   2021-03-31 13:35:25
    |
    |     kernel: proper handle signed modules
    |
    |     If CONFIG_MODULE_SIG_ALL is set in kernelconfig then modules will be
    |     automatically signed during the modules_install phase of a kernel build.
    |
    |     Signed modules are BRITTLE as the signature is outside of the defined ELF
    |     container. Thus they MAY NOT be stripped once the signature is computed
    |     and attached. Note the entire module is the signed payload, including any
    |     and all debug information present at the time of signing.
    |
    |     See: https://www.kernel.org/doc/html/latest/admin-guide/module-signing.html
    |     Signed-off-by: Denis Osterland-Heim <denis.osterland@diehl.com>
    |     Message-Id: <20210331113525.22330-1-denis.osterland@diehl.com>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

We might not sign kernel modules at the time, but apply the principle of
least surprise and port it now to be up to date with the upstream
kernel rule template.

Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=a22b449946eed634f42b
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=565aabf6f36d3ed31544
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-mips/rules/kernel-ar9331.make | 2 +-
 configs/platform-mips/rules/kernel-malta.make  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index bb7ddbc25c94..98452a90a0a4 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -98,7 +98,7 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
 	@$(call install_copy, kernel-ar9331, 0, 0, 0644, \
 		$(IMAGEDIR)/vmlinuz-ar9331, /boot/vmlinuz-ar9331, n)
 
-	@$(call install_glob, kernel-ar9331, 0, 0, -, /lib/modules, *.ko,, k)
+	@$(call install_glob, kernel-ar9331, 0, 0, -, /lib/modules, *.ko,, n)
 	@$(call install_glob, kernel-ar9331, 0, 0, -, /lib/modules,, *.ko */build */source, n)
 
 	@$(call install_finish, kernel-ar9331)
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index 0450e04ce690..cfb387442d41 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -98,7 +98,7 @@ $(STATEDIR)/kernel-malta.targetinstall:
 	@$(call install_copy, kernel-malta, 0, 0, 0644, \
 		$(IMAGEDIR)/vmlinuz-malta, /boot/vmlinuz-malta, n)
 
-	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules, *.ko,, k)
+	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules, *.ko,, n)
 	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules,, *.ko */build */source, n)
 
 	@$(call install_finish, kernel-malta)
-- 
2.29.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules
  2021-04-09 23:02 ` [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules Roland Hieber
@ 2021-04-23 10:55   ` Robert Schwebel
  0 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2021-04-23 10:55 UTC (permalink / raw)
  To: Roland Hieber; +Cc: distrokit

On Sat, Apr 10, 2021 at 01:02:51AM +0200, Roland Hieber wrote:
> This ports the following commits from PTXdist 2021.04.0:
> 
>     | commit a22b449946eed634f42b06b0c385b29621c6d02e
>     | Author: Michael Olbrich <m.olbrich@pengutronix.de>
>     | Date:   2021-04-01 15:58:54
>     |
>     |     template: kernel: proper handle signed modules
>     |
>     |     Same as 565aabf6f36d3ed31544d882394604c4a1b13597 but for the kernel
>     |     template instead of the kernel itself.
>     |
>     |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>     |
>     | commit 565aabf6f36d3ed31544d882394604c4a1b13597
>     | Author: Denis Osterland-Heim <denis.osterland@diehl.com>
>     | Date:   2021-03-31 13:35:25
>     |
>     |     kernel: proper handle signed modules
>     |
>     |     If CONFIG_MODULE_SIG_ALL is set in kernelconfig then modules will be
>     |     automatically signed during the modules_install phase of a kernel build.
>     |
>     |     Signed modules are BRITTLE as the signature is outside of the defined ELF
>     |     container. Thus they MAY NOT be stripped once the signature is computed
>     |     and attached. Note the entire module is the signed payload, including any
>     |     and all debug information present at the time of signing.
>     |
>     |     See: https://www.kernel.org/doc/html/latest/admin-guide/module-signing.html
>     |     Signed-off-by: Denis Osterland-Heim <denis.osterland@diehl.com>
>     |     Message-Id: <20210331113525.22330-1-denis.osterland@diehl.com>
>     |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> We might not sign kernel modules at the time, but apply the principle of
> least surprise and port it now to be up to date with the upstream
> kernel rule template.
> 
> Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=a22b449946eed634f42b
> Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=565aabf6f36d3ed31544
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-mips/rules/kernel-ar9331.make | 2 +-
>  configs/platform-mips/rules/kernel-malta.make  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version
  2021-04-09 23:02 [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Roland Hieber
  2021-04-09 23:02 ` [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules Roland Hieber
@ 2021-04-09 23:02 ` Roland Hieber
  2021-04-23 10:55   ` Robert Schwebel
  2021-04-23 10:54 ` [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Robert Schwebel
  2 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2021-04-09 23:02 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

Since Barebox v2020.11.0, the build system supports a configurable
version string that is baked into the barebox image, see the following
upstream barebox commits:

* commit 98c221e3fad57f271d60 (2020-09-23, "Makefile: add buildsystem version variable")
* commit c7dcac9de597f006fdc8 (2020-09-23, "common: print buildsystem version in barebox banner")
* commit c600d8812e9f3b98591a (2020-09-23, "common: globalvar: add variable for buildsystem_version_string")
* commit 01b53d3b728073996e7e (2020-09-23, "imd: add buildsystem version to metadata")

Set that version string to the Git hash so we can always find out from
which DistroKit version a barebox-in-the-wild was built. (Even if we
don't use barebox >= v2020.11.0 on all platforms yet, future barebox
updates will benefit from this change.)

For mips, we use the upstream barebox rule, which takes the version
string from the platformconfig. For all other platforms, this change
effectively ports the following commit from PTXdist 2021.04.0:

    | commit f5500c922424ee71dd99e80f743ed6d994e5bca6
    | Author: Steffen Trumtrar <s.trumtrar@pengutronix.de>
    | Date:   2021-04-01 10:36:41
    |
    |     rules: barebox: support barebox buildsystem_version
    |
    |     barebox supports setting a buildsystem version. This is useful to have
    |     an exact buildsystem version like a commit hash accessible from barebox.
    |
    |     Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
    |     Message-Id: <20210401083641.9251-2-s.trumtrar@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

Link: https://git.pengutronix.de/cgit/barebox/commit/?id=98c221e3fad57f271d60
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=c7dcac9de597f006fdc8
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=c600d8812e9f3b98591a
Link: https://git.pengutronix.de/cgit/barebox/commit/?id=01b53d3b728073996e7e
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=f5500c922424ee71dd99
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-mips/rules/barebox-ar9331.make    | 1 +
 configs/platform-mips/rules/barebox-common.make    | 1 +
 configs/platform-mips/rules/barebox-malta.make     | 1 +
 configs/platform-rpi/platformconfig                | 3 ++-
 configs/platform-v7a/rules/barebox-am335x-mlo.make | 1 +
 configs/platform-v7a/rules/barebox-am335x.make     | 1 +
 configs/platform-v7a/rules/barebox-at91.make       | 4 +++-
 configs/platform-v7a/rules/barebox-common.make     | 1 +
 configs/platform-v7a/rules/barebox-mx6.make        | 1 +
 configs/platform-v7a/rules/barebox-rpi2.make       | 1 +
 configs/platform-v7a/rules/barebox-stm32mp.make    | 4 +++-
 configs/platform-v7a/rules/barebox-vexpress.make   | 1 +
 configs/platform-v8a/rules/barebox-imx8m.make      | 1 +
 13 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index a5c5205038a6..eb28369252be 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -42,6 +42,7 @@ BAREBOX_AR9331_WRAPPER_BLACKLIST := \
 BAREBOX_AR9331_CONF_OPT := \
 	-C $(BAREBOX_AR9331_DIR) \
 	O=$(BAREBOX_AR9331_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_AR9331)
 
 BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT)
diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make
index 8f7c52fd4c1d..39e860011500 100644
--- a/configs/platform-mips/rules/barebox-common.make
+++ b/configs/platform-mips/rules/barebox-common.make
@@ -37,6 +37,7 @@ BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
 BAREBOX_COMMON_CONF_OPT := \
 	-C $(BAREBOX_COMMON_DIR) \
 	O=$(BAREBOX_COMMON_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_COMMON)
 
 BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index b60f1633e406..d9a63fa13fbf 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -42,6 +42,7 @@ BAREBOX_MALTA_WRAPPER_BLACKLIST := \
 BAREBOX_MALTA_CONF_OPT := \
 	-C $(BAREBOX_MALTA_DIR) \
 	O=$(BAREBOX_MALTA_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_MALTA)
 
 BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT)
diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi/platformconfig
index 42437023857a..1eb295fe02fd 100644
--- a/configs/platform-rpi/platformconfig
+++ b/configs/platform-rpi/platformconfig
@@ -176,7 +176,8 @@ PTXCONF_CONSOLE_SPEED="115200"
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BAREBOX=y
 PTXCONF_BAREBOX_VERSION="2020.08.1"
-# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set
+PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
+PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
 PTXCONF_BAREBOX_MD5="d57031878390cb267f6641aedffcda9f"
 PTXCONF_BAREBOX_CONFIG="barebox.config"
 PTXCONF_BAREBOX_EXTRA_ENV=y
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 534566ba9a1a..96b76daccb1b 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -40,6 +40,7 @@ BAREBOX_AM335X_MLO_WRAPPER_BLACKLIST := \
 BAREBOX_AM335X_MLO_CONF_OPT := \
 	-C $(BAREBOX_AM335X_MLO_DIR) \
 	O=$(BAREBOX_AM335X_MLO_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_AM335X_MLO)
 
 BAREBOX_AM335X_MLO_MAKE_OPT := $(BAREBOX_AM335X_MLO_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index a10474afe017..4a8dec00ecc4 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -41,6 +41,7 @@ BAREBOX_AM335X_WRAPPER_BLACKLIST := \
 BAREBOX_AM335X_CONF_OPT := \
 	-C $(BAREBOX_AM335X_DIR) \
 	O=$(BAREBOX_AM335X_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_AM335X)
 
 BAREBOX_AM335X_MAKE_OPT := $(BAREBOX_AM335X_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make
index 25d6c3f4cba6..a55382a96f35 100644
--- a/configs/platform-v7a/rules/barebox-at91.make
+++ b/configs/platform-v7a/rules/barebox-at91.make
@@ -37,7 +37,9 @@ BAREBOX_AT91_WRAPPER_BLACKLIST := \
 	TARGET_BUILD_ID
 
 BAREBOX_AT91_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_AT91_CONF_OPT := $(call barebox-opts, BAREBOX_AT91)
+BAREBOX_AT91_CONF_OPT := \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
+	$(call barebox-opts, BAREBOX_AT91)
 
 BAREBOX_AT91_MAKE_ENV := $(BAREBOX_AT91_CONF_ENV)
 BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 8f7c52fd4c1d..39e860011500 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -37,6 +37,7 @@ BAREBOX_COMMON_PATH := PATH=$(HOST_PATH)
 BAREBOX_COMMON_CONF_OPT := \
 	-C $(BAREBOX_COMMON_DIR) \
 	O=$(BAREBOX_COMMON_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_COMMON)
 
 BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 525ffd559c0e..c16cc692e6fe 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -41,6 +41,7 @@ BAREBOX_MX6_WRAPPER_BLACKLIST := \
 BAREBOX_MX6_CONF_OPT := \
 	-C $(BAREBOX_MX6_DIR) \
 	O=$(BAREBOX_MX6_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_MX6)
 
 BAREBOX_MX6_MAKE_OPT := $(BAREBOX_MX6_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 636ffebf4206..26ad9805afa3 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -41,6 +41,7 @@ BAREBOX_RPI2_WRAPPER_BLACKLIST := \
 BAREBOX_RPI2_CONF_OPT := \
 	-C $(BAREBOX_RPI2_DIR) \
 	O=$(BAREBOX_RPI2_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_RPI2)
 
 BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
index 2ad1fa4d02b6..9f59e3226894 100644
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ b/configs/platform-v7a/rules/barebox-stm32mp.make
@@ -37,7 +37,9 @@ BAREBOX_STM32MP_WRAPPER_BLACKLIST := \
 	TARGET_BUILD_ID
 
 BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_STM32MP_CONF_OPT := $(call barebox-opts, BAREBOX_STM32MP)
+BAREBOX_STM32MP_CONF_OPT := \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
+	$(call barebox-opts, BAREBOX_STM32MP)
 
 BAREBOX_STM32MP_MAKE_ENV := $(BAREBOX_STM32MP_CONF_ENV)
 BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 625ff79b472d..5c173949d50c 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -41,6 +41,7 @@ BAREBOX_VEXPRESS_WRAPPER_BLACKLIST := \
 BAREBOX_VEXPRESS_CONF_OPT := \
 	-C $(BAREBOX_VEXPRESS_DIR) \
 	O=$(BAREBOX_VEXPRESS_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_VEXPRESS)
 
 BAREBOX_VEXPRESS_MAKE_OPT := $(BAREBOX_VEXPRESS_CONF_OPT)
diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index f9e7d2fd0813..8ea3e4993b87 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -40,6 +40,7 @@ BAREBOX_IMX8M_WRAPPER_BLACKLIST := \
 BAREBOX_IMX8M_CONF_OPT := \
 	-C $(BAREBOX_IMX8M_DIR) \
 	O=$(BAREBOX_IMX8M_BUILD_DIR) \
+	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_IMX8M)
 
 BAREBOX_IMX8M_MAKE_OPT := $(BAREBOX_IMX8M_CONF_OPT)
-- 
2.29.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version
  2021-04-09 23:02 ` [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version Roland Hieber
@ 2021-04-23 10:55   ` Robert Schwebel
  0 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2021-04-23 10:55 UTC (permalink / raw)
  To: Roland Hieber; +Cc: distrokit

On Sat, Apr 10, 2021 at 01:02:52AM +0200, Roland Hieber wrote:
> Since Barebox v2020.11.0, the build system supports a configurable
> version string that is baked into the barebox image, see the following
> upstream barebox commits:
> 
> * commit 98c221e3fad57f271d60 (2020-09-23, "Makefile: add buildsystem version variable")
> * commit c7dcac9de597f006fdc8 (2020-09-23, "common: print buildsystem version in barebox banner")
> * commit c600d8812e9f3b98591a (2020-09-23, "common: globalvar: add variable for buildsystem_version_string")
> * commit 01b53d3b728073996e7e (2020-09-23, "imd: add buildsystem version to metadata")
> 
> Set that version string to the Git hash so we can always find out from
> which DistroKit version a barebox-in-the-wild was built. (Even if we
> don't use barebox >= v2020.11.0 on all platforms yet, future barebox
> updates will benefit from this change.)
> 
> For mips, we use the upstream barebox rule, which takes the version
> string from the platformconfig. For all other platforms, this change
> effectively ports the following commit from PTXdist 2021.04.0:
> 
>     | commit f5500c922424ee71dd99e80f743ed6d994e5bca6
>     | Author: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>     | Date:   2021-04-01 10:36:41
>     |
>     |     rules: barebox: support barebox buildsystem_version
>     |
>     |     barebox supports setting a buildsystem version. This is useful to have
>     |     an exact buildsystem version like a commit hash accessible from barebox.
>     |
>     |     Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>     |     Message-Id: <20210401083641.9251-2-s.trumtrar@pengutronix.de>
>     |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=98c221e3fad57f271d60
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=c7dcac9de597f006fdc8
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=c600d8812e9f3b98591a
> Link: https://git.pengutronix.de/cgit/barebox/commit/?id=01b53d3b728073996e7e
> Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=f5500c922424ee71dd99
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-mips/rules/barebox-ar9331.make    | 1 +
>  configs/platform-mips/rules/barebox-common.make    | 1 +
>  configs/platform-mips/rules/barebox-malta.make     | 1 +
>  configs/platform-rpi/platformconfig                | 3 ++-
>  configs/platform-v7a/rules/barebox-am335x-mlo.make | 1 +
>  configs/platform-v7a/rules/barebox-am335x.make     | 1 +
>  configs/platform-v7a/rules/barebox-at91.make       | 4 +++-
>  configs/platform-v7a/rules/barebox-common.make     | 1 +
>  configs/platform-v7a/rules/barebox-mx6.make        | 1 +
>  configs/platform-v7a/rules/barebox-rpi2.make       | 1 +
>  configs/platform-v7a/rules/barebox-stm32mp.make    | 4 +++-
>  configs/platform-v7a/rules/barebox-vexpress.make   | 1 +
>  configs/platform-v8a/rules/barebox-imx8m.make      | 1 +
>  13 files changed, 18 insertions(+), 3 deletions(-)

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0
  2021-04-09 23:02 [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Roland Hieber
  2021-04-09 23:02 ` [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules Roland Hieber
  2021-04-09 23:02 ` [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version Roland Hieber
@ 2021-04-23 10:54 ` Robert Schwebel
  2 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2021-04-23 10:54 UTC (permalink / raw)
  To: Roland Hieber; +Cc: distrokit

On Sat, Apr 10, 2021 at 01:02:50AM +0200, Roland Hieber wrote:
> Migrate with default settings to the new PTXdist version, which was
> released today.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-mips/platformconfig   |  4 ++--
>  configs/platform-rpi/platformconfig    |  5 +++--
>  configs/platform-v7a/platformconfig    |  4 ++--
>  configs/platform-v8a/platformconfig    |  4 ++--
>  configs/platform-x86_64/platformconfig |  4 ++--
>  configs/ptxconfig                      | 11 ++++++++---
>  6 files changed, 19 insertions(+), 13 deletions(-)

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-04-23 10:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 23:02 [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Roland Hieber
2021-04-09 23:02 ` [DistroKit] [PATCH 2/3] mips: kernel: properly handle signed modules Roland Hieber
2021-04-23 10:55   ` Robert Schwebel
2021-04-09 23:02 ` [DistroKit] [PATCH 3/3] barebox: set barebox build sytem version Roland Hieber
2021-04-23 10:55   ` Robert Schwebel
2021-04-23 10:54 ` [DistroKit] [PATCH 1/3] ptxdist: migrate 2021.03.0 -> 2021.04.0 Robert Schwebel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox