From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template
Date: Thu, 8 Aug 2024 14:28:44 +0200 [thread overview]
Message-ID: <20240808122846.2022136-8-rhi@pengutronix.de> (raw)
In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de>
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 <PKG>_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 <PKG>_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 <rhi@pengutronix.de>
---
.../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
next prev parent reply other threads:[~2024-08-08 12:28 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-31 9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31 9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23 ` Roland Hieber
2024-07-31 12:33 ` Robert Schwebel
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-08 13:41 ` Michael Olbrich
2024-08-13 13:23 ` Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-08 12:28 ` Roland Hieber [this message]
2024-08-08 12:28 ` [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
2024-08-08 12:28 ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule 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=20240808122846.2022136-8-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