From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 05 Dec 2025 23:23:30 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vReD4-008LIT-2H for lore@lore.pengutronix.de; Fri, 05 Dec 2025 23:23:30 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vReD4-0004N7-2K; Fri, 05 Dec 2025 23:23:30 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vReCy-0004Ln-Cb; Fri, 05 Dec 2025 23:23:24 +0100 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vReCy-004Bz3-0U; Fri, 05 Dec 2025 23:23:24 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vReCy-00000009UOU-0OqJ; Fri, 05 Dec 2025 23:23:24 +0100 From: Roland Hieber To: distrokit@pengutronix.de Date: Fri, 5 Dec 2025 23:22:51 +0100 Message-ID: <20251205222320.2261758-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251205222320.2261758-1-rhi@pengutronix.de> References: <20251205222320.2261758-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 2/6] v8a: barebox-r5: clean up recipe X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 --- 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