From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 08 Aug 2024 14:28:56 +0200 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 1sc2GG-007Uae-2c for lore@lore.pengutronix.de; Thu, 08 Aug 2024 14:28:56 +0200 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 1sc2GF-0006EX-UW; Thu, 08 Aug 2024 14:28:55 +0200 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 1sc2G8-0005yL-Fe; Thu, 08 Aug 2024 14:28:48 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sc2G7-005QKS-ST; Thu, 08 Aug 2024 14:28:47 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sc2G7-008U5j-2Z; Thu, 08 Aug 2024 14:28:47 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Thu, 8 Aug 2024 14:28:44 +0200 Message-Id: <20240808122846.2022136-8-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de> References: <20240731091435.2983175-1-rhi@pengutronix.de> <20240808122846.2022136-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template 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 Update the template-generated barebox rules to port the following PTXdist commits: * b0f9f2fe33ca (2020-08-07, Roland Hieber: "barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config") * 682d95986b7a (2020-08-19, Roland Hieber: "barebox, kernel: set _CONF_TOOL := kconfig explicitely") * 5af76a1c7d63 (2020-08-19, Roland Hieber: "barebox, kernel: tab-align variables") * 7fa9235fb915 (2020-10-07, Michael Olbrich: "kernel, barebox: use explicit list of config targets") * 6db79433b230 (2020-09-28, Roland Hieber: "templates: add _LICENSE_FILES variable where appropriate") Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=b0f9f2fe33ca Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=682d95986b7a Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=5af76a1c7d63 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7fa9235fb915 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=6db79433b230 Signed-off-by: Roland Hieber --- .../platform-mips/rules/barebox-ar9331.make | 17 +++++++------- .../platform-mips/rules/barebox-malta.make | 21 +++++++++-------- .../platform-mipsel/rules/barebox-malta.make | 23 ++++++++++--------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index c769d2111978..8627f19c5e79 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -17,16 +17,17 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331 # BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) -BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) +BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SUFFIX := tar.bz2 BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331) -BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION) +BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SOURCE := $(SRCDIR)/$(BAREBOX_AR9331_PATCHES).$(BAREBOX_AR9331_SUFFIX) BAREBOX_AR9331_DIR := $(BUILDDIR)/$(BAREBOX_AR9331) BAREBOX_AR9331_BUILD_DIR := $(BAREBOX_AR9331_DIR)-build BAREBOX_AR9331_CONFIG := $(call ptx/in-platformconfigdir, barebox-ar9331.config) BAREBOX_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_AR9331_LICENSE := GPL-2.0-only +BAREBOX_AR9331_LICENSE := GPL-2.0-only +BAREBOX_AR9331_LICENSE_FILES := BAREBOX_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- @@ -34,18 +35,18 @@ BAREBOX_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_AR9331_PATH := PATH=$(HOST_PATH) +BAREBOX_AR9331_PATH := PATH=$(HOST_PATH) BAREBOX_AR9331_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AR9331_CONF_OPT := \ +BAREBOX_AR9331_CONF_TOOL := kconfig +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) +BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT) BAREBOX_AR9331_IMAGES := images/barebox-dptechnics-dpt-module.img BAREBOX_AR9331_IMAGES := $(addprefix $(BAREBOX_AR9331_BUILD_DIR)/,$(BAREBOX_AR9331_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-ar9331.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-ar9331_oldconfig barebox-ar9331_menuconfig barebox-ar9331_nconfig: $(STATEDIR)/barebox-ar9331.extract +$(call ptx/kconfig-targets, barebox-ar9331): $(STATEDIR)/barebox-ar9331.extract @$(call world/kconfig, BAREBOX_AR9331, $(subst barebox-ar9331_,,$@)) # vim: syntax=make diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index ae4dcfe8d6e4..281f3338504b 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -17,35 +17,36 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) -BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) -BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX) BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA) -BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build +BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_BUILD_OOT := KEEP +BAREBOX_MALTA_LICENSE := GPL-2.0-only +BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) +BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) BAREBOX_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_MALTA_CONF_OPT := \ +BAREBOX_MALTA_CONF_TOOL := kconfig +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) +BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract +$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract @$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@)) # vim: syntax=make diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index ec40264bdc48..93502441fc0d 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -15,37 +15,38 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) +BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5)) -BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) -BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX) BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA) -BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build +BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_BUILD_OOT := KEEP +BAREBOX_MALTA_LICENSE := GPL-2.0-only +BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) +BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) BAREBOX_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_MALTA_CONF_OPT := \ +BAREBOX_MALTA_CONF_TOOL := kconfig +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) +BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract +$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract @$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@)) # vim: syntax=make -- 2.39.2