From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 2/6] v8a: barebox-r5: clean up recipe
Date: Fri, 5 Dec 2025 23:22:51 +0100 [thread overview]
Message-ID: <20251205222320.2261758-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20251205222320.2261758-1-rhi@pengutronix.de>
The recipe uses variables from another recipe, so depend on that and
make sure that the variables are only expanded on use (= instead of :=)
after all recipes have been included and the dependant variables have
been defined. While we're at it, adjust the variable definitions
consistently.
Since barebox-r5 uses the same source tarball and patch stack as
barebox, also inherit its license.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-v8a/platforms/barebox-r5.in | 1 +
configs/platform-v8a/rules/barebox-r5.make | 30 ++++++++++----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/configs/platform-v8a/platforms/barebox-r5.in b/configs/platform-v8a/platforms/barebox-r5.in
index 55147bea725b..44883fd63388 100644
--- a/configs/platform-v8a/platforms/barebox-r5.in
+++ b/configs/platform-v8a/platforms/barebox-r5.in
@@ -3,6 +3,7 @@
config BAREBOX_R5
tristate
prompt "Barebox (r5)"
+ select BAREBOX if BUILDTIME
select HOST_SYSTEM_PYTHON3
select HOST_SYSTEM_PYTHON3_PYYAML
select FIRMWARE_TI
diff --git a/configs/platform-v8a/rules/barebox-r5.make b/configs/platform-v8a/rules/barebox-r5.make
index 37a38f255e12..c398e46da793 100644
--- a/configs/platform-v8a/rules/barebox-r5.make
+++ b/configs/platform-v8a/rules/barebox-r5.make
@@ -14,18 +14,18 @@ PACKAGES-$(PTXCONF_BAREBOX_R5) += barebox-r5
#
# Paths and names
#
-BAREBOX_R5_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX)
-BAREBOX_R5_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX)
-BAREBOX_R5 := barebox-r5-$(BAREBOX_R5_VERSION)
-BAREBOX_R5_SUFFIX := tar.bz2
-BAREBOX_R5_URL := $(call barebox-url, BAREBOX_R5)
-BAREBOX_R5_PATCHES := barebox-$(BAREBOX_R5_VERSION)
-BAREBOX_R5_SOURCE := $(SRCDIR)/$(BAREBOX_R5_PATCHES).$(BAREBOX_R5_SUFFIX)
-BAREBOX_R5_DIR := $(BUILDDIR)/$(BAREBOX_R5)
-BAREBOX_R5_BUILD_DIR := $(BAREBOX_R5_DIR)-build
-BAREBOX_R5_CONFIG := $(call ptx/in-platformconfigdir, barebox-r5.config)
-BAREBOX_R5_LICENSE := GPL-2.0-only
-BAREBOX_R5_LICENSE_FILES :=
+BAREBOX_R5_VERSION = $(call ptx/config-version, PTXCONF_BAREBOX)
+BAREBOX_R5_MD5 = $(call ptx/config-md5, PTXCONF_BAREBOX)
+BAREBOX_R5 = barebox-r5-$(BAREBOX_R5_VERSION)
+BAREBOX_R5_SUFFIX := tar.bz2
+BAREBOX_R5_URL = $(call barebox-url, BAREBOX_R5)
+BAREBOX_R5_PATCHES = barebox-$(BAREBOX_R5_VERSION)
+BAREBOX_R5_SOURCE = $(SRCDIR)/$(BAREBOX_R5_PATCHES).$(BAREBOX_R5_SUFFIX)
+BAREBOX_R5_DIR = $(BUILDDIR)/$(BAREBOX_R5)
+BAREBOX_R5_BUILD_DIR = $(BAREBOX_R5_DIR)-build
+BAREBOX_R5_CONFIG := $(call ptx/in-platformconfigdir, barebox-r5.config)
+BAREBOX_R5_LICENSE = $(BAREBOX_LICENSE)
+BAREBOX_R5_LICENSE_FILES = $(BAREBOX_LICENSE_FILES)
BAREBOX_R5_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
@@ -40,16 +40,16 @@ BAREBOX_R5_WRAPPER_BLACKLIST := \
$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
BAREBOX_R5_CONF_TOOL := kconfig
-BAREBOX_R5_CONF_OPT := \
+BAREBOX_R5_CONF_OPT = \
-C $(BAREBOX_R5_DIR) \
O=$(BAREBOX_R5_BUILD_DIR) \
$(filter-out CROSS_COMPILE%, $(call barebox-opts, BAREBOX_R5)) \
CROSS_COMPILE=$(PTXDIST_WORKSPACE)/selected_toolchain_r5/$(PTXCONF_COMPILERPREFIX_R5)
-BAREBOX_R5_MAKE_OPT := $(BAREBOX_R5_CONF_OPT)
+BAREBOX_R5_MAKE_OPT = $(BAREBOX_R5_CONF_OPT)
BAREBOX_R5_IMAGES := images/barebox-beagleplay-r5.img
-BAREBOX_R5_IMAGES := $(addprefix $(BAREBOX_R5_BUILD_DIR)/,$(BAREBOX_R5_IMAGES))
+BAREBOX_R5_IMAGES = $(addprefix $(BAREBOX_R5_BUILD_DIR)/,$(BAREBOX_R5_IMAGES))
ifdef PTXCONF_BAREBOX_R5
$(BAREBOX_R5_CONFIG):
--
2.47.3
next prev parent reply other threads:[~2025-12-05 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-05 22:22 [DistroKit] [PATCH 1/6] v8a: barebox-r5: sync config file changes Roland Hieber
2025-12-05 22:22 ` Roland Hieber [this message]
2025-12-05 22:22 ` [DistroKit] [PATCH 3/6] v7a: at91bootstrap: version bump 4.0.6-rc1 -> 4.0.12 Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 4/6] v8a: tf-a: make it compile with GCC 15 Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 5/6] v8a: tf-a: re-export patch queue with 'git ptx-patches' Roland Hieber
2025-12-05 22:22 ` [DistroKit] [PATCH 6/6] toolchains: version bump 2024.11.1 -> 2025.11.0 Roland Hieber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251205222320.2261758-2-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox