From 22cf9785f7921ce59ec17c5efca219634fff12b3 Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Sat, 10 Apr 2021 01:02:52 +0200 Subject: barebox: set barebox build sytem version 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 | 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 | Message-Id: <20210401083641.9251-2-s.trumtrar@pengutronix.de> | Signed-off-by: Michael Olbrich 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 Signed-off-by: Robert Schwebel --- 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 + 8 files changed, 12 insertions(+), 2 deletions(-) (limited to 'configs/platform-v7a/rules') diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make index 534566b..96b76da 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 a10474a..4a8dec0 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 25d6c3f..a55382a 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 8f7c52f..39e8600 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 525ffd5..c16cc69 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 636ffeb..26ad980 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 2ad1fa4..9f59e32 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 625ff79..5c17394 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) -- cgit v1.2.3