[DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*

DistroKit Mailinglist
 help / color / mirror / Atom feed

* [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH
@ 2021-11-26 10:39 Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 2/5] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template Roland Hieber
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Roland Hieber @ 2021-11-26 10:39 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

Even if this is currently unused, having this variable like in the
PTXdist template prevents confusion when backporting patches from the
template to the BSP recipes.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: no changes

 configs/platform-mips/rules/kernel-ar9331.make  | 1 +
 configs/platform-mips/rules/kernel-malta.make   | 1 +
 configs/platform-mipsel/rules/kernel-malta.make | 1 +
 3 files changed, 3 insertions(+)

diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index 98452a90a0a4..7893431abeaf 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -36,6 +36,7 @@ KERNEL_AR9331_BUILD_OOT	:= KEEP
 KERNEL_AR9331_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+KERNEL_AR9331_PATH	:= PATH=$(CROSS_PATH)
 KERNEL_AR9331_CONF_OPT	:= \
 	-C $(KERNEL_AR9331_DIR) \
 	O=$(KERNEL_AR9331_BUILD_DIR) \
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index cfb387442d41..f93262cbccd1 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -36,6 +36,7 @@ KERNEL_MALTA_BUILD_OOT	:= KEEP
 KERNEL_MALTA_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
 KERNEL_MALTA_CONF_OPT	:= \
 	-C $(KERNEL_MALTA_DIR) \
 	O=$(KERNEL_MALTA_BUILD_DIR) \
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index cfb387442d41..f93262cbccd1 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -36,6 +36,7 @@ KERNEL_MALTA_BUILD_OOT	:= KEEP
 KERNEL_MALTA_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
 KERNEL_MALTA_CONF_OPT	:= \
 	-C $(KERNEL_MALTA_DIR) \
 	O=$(KERNEL_MALTA_BUILD_DIR) \
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH v2 2/5] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template
  2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
@ 2021-11-26 10:39 ` Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 3/5] mips, mipsel: kernel-*: rework device-tree handling Roland Hieber
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-11-26 10:39 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

This ports the following PTXdist commits:

    | commit 5b006ca1670901a4b74a863535e68ec5324b2366
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2019-10-28 22:47:54
    |
    |     template-kernel: use ptx/nl
    |
    |     Otherwise, errors might be ignored.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit a81a9f0fa98d78c62749011666e360603ae35b08
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-06-23 12:17:30
    |
    |     template: kernel: fix make syntax
    |
    |     The closing brace for the foreach macro was removed when the line was
    |     converted from ';' to '$(ptx/nl)'.
    |
    |     Fixes: 5b006ca1670901a4b74a ("template-kernel: use ptx/nl")
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |     Message-Id: <20200623101730.32495-1-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 0284f2d88e5c50ebc65684282ef0be8a6259f76b
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2020-06-26 11:15:34
    |
    |     template-kernel: handle plugin detection for kernel version >= v5.7
    |
    |     The old hack to disable plugin support no longer works with v5.7.
    |     Instead, add -DGENERATOR_FILE to the HOSTCC/HOSTCXX command.
    |     The plugin headers produce an error if this is defined.
    |
    |     Tested with v4.19, v5.6 and v5.7.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 7fb691e014c06b17c17dffe0d6c5d5f6c2a54403
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2020-07-02 11:58:18
    |
    |     template-kernel: improve
    |
    |     The imagedir is deleted in 'ptxdist clean root'. So installing files there
    |     should only happen in targetinstall.
    |
    |     Keep the variable handling similar to the kernel package and make it
    |     possible to overwrite the kernel version in the kernel config.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 80ce928da2c8e0822e91964f0d65afcea5966c1c
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-08-06 18:49:47
    |
    |     kernel: fix typo in HOSTCXX variable
    |
    |     The typo makes the variable expand to nothing. This was probably never
    |     caught because g++ is usually not used when building the kernel.
    |
    |     Fixes: a668fd6120742fe5ef6e (2020-06-11, "kernel: handle plugin detection for kernel version >= v5.7")
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |     Message-Id: <20200806164947.4187-1-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit b0f9f2fe33ca9027a554395c7ff467cabdc255e3
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-08-07 12:44:24
    |
    |     barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config
    |
    |     These config targets are documented in the man page, but until now, they
    |     only resulted in an error:
    |
    |         $ ptxdist alldefconfig kernel
    |         ptxdist: Checking dependencies. This may take some seconds.
    |
    |         make: *** No rule to make target 'kernel_alldefconfig'.  Stop.
    |
    |     Both kernel and barebox support all config targets which can be given on
    |     the ptxdist command line, so keep the match in the make recipe broad, as
    |     the ptxdist option parser will catch unknown config targets.
    |
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |     Message-Id: <20200807104425.30276-2-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 682d95986b7acfcabb31a25c58f0074e69c9005d
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-08-19 13:27:00
    |
    |     barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely
    |
    |     Until now this worked without setting the variable because
    |     ptxd_make_world_init tries to autodetect the config tool, but we should
    |     make this explicit.
    |
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |
    |     Message-Id: <20200819112703.11988-1-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 5af76a1c7d631cd69e673e4ac77783ba059b109d
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-08-19 13:27:01
    |
    |     barebox, kernel: tab-align variables
    |
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |     Message-Id: <20200819112703.11988-2-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 7fa9235fb915e537d21054dc6a60af6981969ba5
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2020-10-07 11:32:05
    |
    |     kernel, barebox: use explicit list of config targets
    |
    |     The problem with the pattern rule is that it also matches some files, such
    |     as $(PTXDIST_TOPDIR)/config/images/barebox_partitions.config. This results
    |     in strange error messages.
    |
    |     Use a global list of possible config targets and use it to generate
    |     explicit lists of make targets.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 6db79433b230a4d86a2f8b74442ed2d8239ab6cd
    | Author: Roland Hieber <rhi@pengutronix.de>
    | Date:   2020-09-28 16:23:50
    |
    |     templates: add <PKG>_LICENSE_FILES variable where appropriate
    |
    |     Signed-off-by: Roland Hieber <rhi@pengutronix.de>
    |     Message-Id: <20200928142350.31523-1-rhi@pengutronix.de>
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 7a90f622f3e46e1cbae6ddc4c4debe4ae62a3e52
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2021-04-01 16:09:33
    |
    |     template: kernel: fix disabling gcc plugins for >= v5.11
    |
    |     Just a copy of the same change from the kernel package.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
    |
    | commit 533f7709f61c54a1c133c5415be8de9b671a8095
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2021-04-15 11:19:06
    |
    |     kernel/kernel-template: set PTXDIST_NO_GCC_PLUGINS=1 in _MAKE_ENV as well
    |
    |     Otherwise an implicit 'oldconfig' in the compile stage will try to enable
    |     plugins again.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=a81a9f0fa98d78c62749
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=0284f2d88e5c50ebc656
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=7fb691e014c06b17c17d
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=80ce928da2c8e0822e91
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=b0f9f2fe33ca9027a554
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=682d95986b7acfcabb31
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=5af76a1c7d631cd69e67
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=7fa9235fb915e537d210
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=6db79433b230a4d86a2f
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=7a90f622f3e46e1cbae6
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=533f7709f61c54a1c133

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: no changes

 .../platform-mips/rules/kernel-ar9331.make    | 41 ++++++++++-------
 configs/platform-mips/rules/kernel-malta.make | 45 ++++++++++++-------
 configs/platform-mips/rules/kernel.make       |  2 +-
 .../platform-mipsel/rules/kernel-malta.make   | 39 ++++++++++------
 configs/platform-mipsel/rules/kernel.make     |  2 +-
 5 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index 7893431abeaf..b4a33fb09e38 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -26,6 +26,7 @@ KERNEL_AR9331_BUILD_DIR	:= $(KERNEL_AR9331_DIR)-build
 KERNEL_AR9331_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-ar9331)
 KERNEL_AR9331_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
 KERNEL_AR9331_LICENSE	:= GPL-2.0-only
+KERNEL_AR9331_LICENSE_FILES	:=
 KERNEL_AR9331_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
@@ -36,15 +37,28 @@ KERNEL_AR9331_BUILD_OOT	:= KEEP
 KERNEL_AR9331_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-KERNEL_AR9331_PATH	:= PATH=$(CROSS_PATH)
-KERNEL_AR9331_CONF_OPT	:= \
+KERNEL_AR9331_PATH		:= PATH=$(CROSS_PATH)
+KERNEL_AR9331_SHARED_OPT	:= \
 	-C $(KERNEL_AR9331_DIR) \
 	O=$(KERNEL_AR9331_BUILD_DIR) \
 	$(call kernel-opts, KERNEL_AR9331)
 
 # no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_AR9331_CONF_OPT += \
-	HOSTCXX=false
+KERNEL_AR9331_SHARED_OPT	+= \
+	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
+	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
+KERNEL_AR9331_CONF_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+KERNEL_AR9331_MAKE_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+
+KERNEL_AR9331_CONF_TOOL	:= kconfig
+KERNEL_AR9331_CONF_OPT	:= \
+	$(KERNEL_AR9331_SHARED_OPT)
+
+# force using KERNEL_AR9331_VERSION in the kernelconfig
+#KERNEL_AR9331_CONF_OPT	+= \
+#	KERNELVERSION=$(KERNEL_AR9331_VERSION)
 
 KERNEL_AR9331_IMAGES := vmlinuz
 KERNEL_AR9331_IMAGES := $(addprefix $(KERNEL_AR9331_BUILD_DIR)/,$(KERNEL_AR9331_IMAGES))
@@ -64,25 +78,18 @@ endif
 # Compile
 # ----------------------------------------------------------------------------
 
-KERNEL_AR9331_MAKE_OPT := \
-	$(KERNEL_AR9331_CONF_OPT) \
+KERNEL_AR9331_MAKE_OPT	:= \
+	$(KERNEL_AR9331_SHARED_OPT) \
 	vmlinuz modules
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-KERNEL_AR9331_INSTALL_OPT := \
+KERNEL_AR9331_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_AR9331) \
 	modules_install
 
-$(STATEDIR)/kernel-ar9331.install:
-	@$(call targetinfo)
-	@$(call world/install, KERNEL_AR9331)
-	@$(foreach image, $(KERNEL_AR9331_IMAGES), \
-		install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl))
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -90,6 +97,10 @@ $(STATEDIR)/kernel-ar9331.install:
 $(STATEDIR)/kernel-ar9331.targetinstall:
 	@$(call targetinfo)
 
+	@$(foreach image, $(KERNEL_AR9331_IMAGES), \
+		install -v -m 644 $(image) \
+			$(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl))
+
 	@$(call install_init,  kernel-ar9331)
 	@$(call install_fixup, kernel-ar9331, PRIORITY,optional)
 	@$(call install_fixup, kernel-ar9331, SECTION,base)
@@ -110,7 +121,7 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel-ar9331_oldconfig kernel-ar9331_menuconfig kernel-ar9331_nconfig: $(STATEDIR)/kernel-ar9331.extract
+$(call ptx/kconfig-targets, kernel-ar9331): $(STATEDIR)/kernel-ar9331.extract
 	@$(call world/kconfig, KERNEL_AR9331, $(subst kernel-ar9331_,,$@))
 
 # vim: syntax=make
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index f93262cbccd1..1d8b72c8efc2 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -26,6 +26,7 @@ KERNEL_MALTA_BUILD_DIR	:= $(KERNEL_MALTA_DIR)-build
 KERNEL_MALTA_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-malta)
 KERNEL_MALTA_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
 KERNEL_MALTA_LICENSE	:= GPL-2.0-only
+KERNEL_MALTA_LICENSE_FILES	:=
 KERNEL_MALTA_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
@@ -36,18 +37,31 @@ KERNEL_MALTA_BUILD_OOT	:= KEEP
 KERNEL_MALTA_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
-KERNEL_MALTA_CONF_OPT	:= \
+KERNEL_MALTA_PATH	:= PATH=$(CROSS_PATH)
+KERNEL_MALTA_SHARED_OPT	:= \
 	-C $(KERNEL_MALTA_DIR) \
 	O=$(KERNEL_MALTA_BUILD_DIR) \
 	$(call kernel-opts, KERNEL_MALTA)
 
 # no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_MALTA_CONF_OPT += \
-	HOSTCXX=false
+KERNEL_MALTA_SHARED_OPT	+= \
+	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
+	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
+KERNEL_MALTA_CONF_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+KERNEL_MALTA_MAKE_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+
+KERNEL_MALTA_CONF_TOOL	:= kconfig
+KERNEL_MALTA_CONF_OPT	:= \
+	$(KERNEL_MALTA_SHARED_OPT)
+
+# force using KERNEL_MALTA_VERSION in the kernelconfig
+#KERNEL_MALTA_CONF_OPT	+= \
+#	KERNELVERSION=$(KERNEL_MALTA_VERSION)
 
-KERNEL_MALTA_IMAGES := vmlinuz
-KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES))
+KERNEL_MALTA_IMAGES	:= vmlinuz
+KERNEL_MALTA_IMAGES	:= $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES))
 
 ifdef PTXCONF_KERNEL_MALTA
 $(KERNEL_MALTA_CONFIG):
@@ -64,25 +78,18 @@ endif
 # Compile
 # ----------------------------------------------------------------------------
 
-KERNEL_MALTA_MAKE_OPT := \
-	$(KERNEL_MALTA_CONF_OPT) \
+KERNEL_MALTA_MAKE_OPT	:= \
+	$(KERNEL_MALTA_SHARED_OPT) \
 	vmlinuz modules
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-KERNEL_MALTA_INSTALL_OPT := \
+KERNEL_MALTA_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_MALTA) \
 	modules_install
 
-$(STATEDIR)/kernel-malta.install:
-	@$(call targetinfo)
-	@$(call world/install, KERNEL_MALTA)
-	@$(foreach image, $(KERNEL_MALTA_IMAGES), \
-		install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -90,6 +97,10 @@ $(STATEDIR)/kernel-malta.install:
 $(STATEDIR)/kernel-malta.targetinstall:
 	@$(call targetinfo)
 
+	@$(foreach image, $(KERNEL_MALTA_IMAGES), \
+		install -v -m 644 $(image) \
+			$(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
+
 	@$(call install_init,  kernel-malta)
 	@$(call install_fixup, kernel-malta, PRIORITY,optional)
 	@$(call install_fixup, kernel-malta, SECTION,base)
@@ -110,7 +121,7 @@ $(STATEDIR)/kernel-malta.targetinstall:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel-malta_oldconfig kernel-malta_menuconfig kernel-malta_nconfig: $(STATEDIR)/kernel-malta.extract
+$(call ptx/kconfig-targets, kernel-malta): $(STATEDIR)/kernel-malta.extract
 	@$(call world/kconfig, KERNEL_MALTA, $(subst kernel-malta_,,$@))
 
 # vim: syntax=make
diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make
index a9eb0f207a80..6d5ca4d4ea0e 100644
--- a/configs/platform-mips/rules/kernel.make
+++ b/configs/platform-mips/rules/kernel.make
@@ -76,7 +76,7 @@ $(STATEDIR)/kernel.install:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract
+$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract
 	@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
 
 # vim: syntax=make
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index f93262cbccd1..94f49b89b774 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -26,6 +26,7 @@ KERNEL_MALTA_BUILD_DIR	:= $(KERNEL_MALTA_DIR)-build
 KERNEL_MALTA_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-malta)
 KERNEL_MALTA_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
 KERNEL_MALTA_LICENSE	:= GPL-2.0-only
+KERNEL_MALTA_LICENSE_FILES	:=
 KERNEL_MALTA_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
@@ -37,14 +38,27 @@ KERNEL_MALTA_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
-KERNEL_MALTA_CONF_OPT	:= \
+KERNEL_MALTA_SHARED_OPT	:= \
 	-C $(KERNEL_MALTA_DIR) \
 	O=$(KERNEL_MALTA_BUILD_DIR) \
 	$(call kernel-opts, KERNEL_MALTA)
 
 # no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_MALTA_CONF_OPT += \
-	HOSTCXX=false
+KERNEL_MALTA_SHARED_OPT	+= \
+	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
+	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
+KERNEL_MALTA_CONF_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+KERNEL_MALTA_MAKE_ENV	:= \
+	PTXDIST_NO_GCC_PLUGINS=1
+
+KERNEL_MALTA_CONF_TOOL	:= kconfig
+KERNEL_MALTA_CONF_OPT	:= \
+	$(KERNEL_MALTA_SHARED_OPT)
+
+# force using KERNEL_MALTA_VERSION in the kernelconfig
+#KERNEL_MALTA_CONF_OPT	+= \
+#	KERNELVERSION=$(KERNEL_MALTA_VERSION)
 
 KERNEL_MALTA_IMAGES := vmlinuz
 KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES))
@@ -64,25 +78,18 @@ endif
 # Compile
 # ----------------------------------------------------------------------------
 
-KERNEL_MALTA_MAKE_OPT := \
-	$(KERNEL_MALTA_CONF_OPT) \
+KERNEL_MALTA_MAKE_OPT	:= \
+	$(KERNEL_MALTA_SHARED_OPT) \
 	vmlinuz modules
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-KERNEL_MALTA_INSTALL_OPT := \
+KERNEL_MALTA_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_MALTA) \
 	modules_install
 
-$(STATEDIR)/kernel-malta.install:
-	@$(call targetinfo)
-	@$(call world/install, KERNEL_MALTA)
-	@$(foreach image, $(KERNEL_MALTA_IMAGES), \
-		install -m 644 $(image) $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
-	@$(call touch)
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -90,6 +97,10 @@ $(STATEDIR)/kernel-malta.install:
 $(STATEDIR)/kernel-malta.targetinstall:
 	@$(call targetinfo)
 
+	@$(foreach image, $(KERNEL_MALTA_IMAGES), \
+		install -v -m 644 $(image) \
+			$(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
+
 	@$(call install_init,  kernel-malta)
 	@$(call install_fixup, kernel-malta, PRIORITY,optional)
 	@$(call install_fixup, kernel-malta, SECTION,base)
@@ -110,7 +121,7 @@ $(STATEDIR)/kernel-malta.targetinstall:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel-malta_oldconfig kernel-malta_menuconfig kernel-malta_nconfig: $(STATEDIR)/kernel-malta.extract
+$(call ptx/kconfig-targets, kernel-malta): $(STATEDIR)/kernel-malta.extract
 	@$(call world/kconfig, KERNEL_MALTA, $(subst kernel-malta_,,$@))
 
 # vim: syntax=make
diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make
index a9eb0f207a80..6d5ca4d4ea0e 100644
--- a/configs/platform-mipsel/rules/kernel.make
+++ b/configs/platform-mipsel/rules/kernel.make
@@ -76,7 +76,7 @@ $(STATEDIR)/kernel.install:
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
 
-kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract
+$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract
 	@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
 
 # vim: syntax=make
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH v2 3/5] mips, mipsel: kernel-*: rework device-tree handling
  2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 2/5] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template Roland Hieber
@ 2021-11-26 10:39 ` Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 4/5] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5 Roland Hieber
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-11-26 10:39 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

This ports the kernel template part of PTXdist commit f50cd1449e934730:

    | commit f50cd1449e9347309b1050b0b738882dac1954e9
    | Author: Michael Olbrich <m.olbrich@pengutronix.de>
    | Date:   2021-07-09 17:25:41
    |
    |     rework device-tree handling
    |
    |     It's not really possible to build a dtb by itself. A lot of included dtsi
    |     and header files are needed. So build the device-trees with the package
    |     that provides these files. Currently that's the kernel package.
    |
    |     This also means, that other kernel packages can have their own device-trees
    |     as well.
    |
    |     Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

Set KERNEL_*_DTS to the current values of PTXCONF_DTC_OFTREE_DTS from
the platformconfig, as this symbol will vanish when migrating to the
next PTXdist version.

Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=f50cd1449e9347309b10

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: no changes

 .../platform-mips/rules/kernel-ar9331.make    | 31 +++++++++++++++++++
 configs/platform-mips/rules/kernel-malta.make | 31 +++++++++++++++++++
 .../platform-mipsel/rules/kernel-malta.make   | 31 +++++++++++++++++++
 3 files changed, 93 insertions(+)

diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index b4a33fb09e38..7b9782d2b696 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -25,10 +25,16 @@ KERNEL_AR9331_DIR	:= $(BUILDDIR)/$(KERNEL_AR9331)
 KERNEL_AR9331_BUILD_DIR	:= $(KERNEL_AR9331_DIR)-build
 KERNEL_AR9331_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-ar9331)
 KERNEL_AR9331_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
+KERNEL_AR9331_DTS_PATH	:= ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/qca
+KERNEL_AR9331_DTS	:= ar9331_dpt_module.dts
+KERNEL_AR9331_DTB_FILES	:= $(addsuffix .dtb,$(basename $(KERNEL_AR9331_DTS)))
 KERNEL_AR9331_LICENSE	:= GPL-2.0-only
 KERNEL_AR9331_LICENSE_FILES	:=
 KERNEL_AR9331_BUILD_OOT	:= KEEP
 
+# track changes to devices-trees in the BSP
+$(call world/dts-cfghash-file, KERNEL_AR9331)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -90,6 +96,12 @@ KERNEL_AR9331_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_AR9331) \
 	modules_install
 
+$(STATEDIR)/kernel-ar9331.install:
+	@$(call targetinfo)
+	@$(call world/install, KERNEL_AR9331)
+	@$(call world/dtb, KERNEL_AR9331)
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -101,6 +113,11 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
 		install -v -m 644 $(image) \
 			$(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl))
 
+	@$(foreach dtb ,$(KERNEL_AR9331_DTB_FILES), \
+		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
+		install -D -m0644 $(KERNEL_AR9331_PKGDIR)/boot/$(dtb) \
+			$(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 	@$(call install_init,  kernel-ar9331)
 	@$(call install_fixup, kernel-ar9331, PRIORITY,optional)
 	@$(call install_fixup, kernel-ar9331, SECTION,base)
@@ -110,6 +127,10 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
 	@$(call install_copy, kernel-ar9331, 0, 0, 0644, \
 		$(IMAGEDIR)/vmlinuz-ar9331, /boot/vmlinuz-ar9331, n)
 
+	@$(foreach dtb, $(KERNEL_AR9331_DTB_FILES), \
+		$(call install_copy, kernel-ar9331, 0, 0, 0644, -, \
+			/boot/$(dtb), n)$(ptx/nl))
+
 	@$(call install_glob, kernel-ar9331, 0, 0, -, /lib/modules, *.ko,, n)
 	@$(call install_glob, kernel-ar9331, 0, 0, -, /lib/modules,, *.ko */build */source, n)
 
@@ -117,6 +138,16 @@ $(STATEDIR)/kernel-ar9331.targetinstall:
 
 	@$(call touch)
 
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/kernel-ar9331.clean:
+	@$(call targetinfo)
+	@$(call clean_pkg, KERNEL_AR9331)
+	@$(foreach dtb,$(KERNEL_AR9331_DTB_FILES), \
+		rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index 1d8b72c8efc2..c5028b996264 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -25,10 +25,16 @@ KERNEL_MALTA_DIR	:= $(BUILDDIR)/$(KERNEL_MALTA)
 KERNEL_MALTA_BUILD_DIR	:= $(KERNEL_MALTA_DIR)-build
 KERNEL_MALTA_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-malta)
 KERNEL_MALTA_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
+KERNEL_MALTA_DTS_PATH	:= ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti
+KERNEL_MALTA_DTS	:= malta.dts
+KERNEL_MALTA_DTB_FILES	:= $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS)))
 KERNEL_MALTA_LICENSE	:= GPL-2.0-only
 KERNEL_MALTA_LICENSE_FILES	:=
 KERNEL_MALTA_BUILD_OOT	:= KEEP
 
+# track changes to devices-trees in the BSP
+$(call world/dts-cfghash-file, KERNEL_MALTA)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -90,6 +96,12 @@ KERNEL_MALTA_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_MALTA) \
 	modules_install
 
+$(STATEDIR)/kernel-malta.install:
+	@$(call targetinfo)
+	@$(call world/install, KERNEL_MALTA)
+	@$(call world/dtb, KERNEL_MALTA)
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -101,6 +113,11 @@ $(STATEDIR)/kernel-malta.targetinstall:
 		install -v -m 644 $(image) \
 			$(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
 
+	@$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \
+		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
+		install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \
+			$(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 	@$(call install_init,  kernel-malta)
 	@$(call install_fixup, kernel-malta, PRIORITY,optional)
 	@$(call install_fixup, kernel-malta, SECTION,base)
@@ -110,6 +127,10 @@ $(STATEDIR)/kernel-malta.targetinstall:
 	@$(call install_copy, kernel-malta, 0, 0, 0644, \
 		$(IMAGEDIR)/vmlinuz-malta, /boot/vmlinuz-malta, n)
 
+	@$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \
+		$(call install_copy, kernel-malta, 0, 0, 0644, -, \
+			/boot/$(dtb), n)$(ptx/nl))
+
 	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules, *.ko,, n)
 	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules,, *.ko */build */source, n)
 
@@ -117,6 +138,16 @@ $(STATEDIR)/kernel-malta.targetinstall:
 
 	@$(call touch)
 
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/kernel-malta.clean:
+	@$(call targetinfo)
+	@$(call clean_pkg, KERNEL_MALTA)
+	@$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \
+		rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index 94f49b89b774..c2bea47e9d0c 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -25,10 +25,16 @@ KERNEL_MALTA_DIR	:= $(BUILDDIR)/$(KERNEL_MALTA)
 KERNEL_MALTA_BUILD_DIR	:= $(KERNEL_MALTA_DIR)-build
 KERNEL_MALTA_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig-malta)
 KERNEL_MALTA_REF_CONFIG	:= $(call ptx/in-platformconfigdir, kernelconfig)
+KERNEL_MALTA_DTS_PATH	:= ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti
+KERNEL_MALTA_DTS	:= malta.dts
+KERNEL_MALTA_DTB_FILES	:= $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS)))
 KERNEL_MALTA_LICENSE	:= GPL-2.0-only
 KERNEL_MALTA_LICENSE_FILES	:=
 KERNEL_MALTA_BUILD_OOT	:= KEEP
 
+# track changes to devices-trees in the BSP
+$(call world/dts-cfghash-file, KERNEL_MALTA)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
@@ -90,6 +96,12 @@ KERNEL_MALTA_INSTALL_OPT	:= \
 	$(call kernel-opts, KERNEL_MALTA) \
 	modules_install
 
+$(STATEDIR)/kernel-malta.install:
+	@$(call targetinfo)
+	@$(call world/install, KERNEL_MALTA)
+	@$(call world/dtb, KERNEL_MALTA)
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -101,6 +113,11 @@ $(STATEDIR)/kernel-malta.targetinstall:
 		install -v -m 644 $(image) \
 			$(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl))
 
+	@$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \
+		echo -e "Installing $(dtb) ...\n"$(ptx/nl) \
+		install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \
+			$(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 	@$(call install_init,  kernel-malta)
 	@$(call install_fixup, kernel-malta, PRIORITY,optional)
 	@$(call install_fixup, kernel-malta, SECTION,base)
@@ -110,6 +127,10 @@ $(STATEDIR)/kernel-malta.targetinstall:
 	@$(call install_copy, kernel-malta, 0, 0, 0644, \
 		$(IMAGEDIR)/vmlinuz-malta, /boot/vmlinuz-malta, n)
 
+	@$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \
+		$(call install_copy, kernel-malta, 0, 0, 0644, -, \
+			/boot/$(dtb), n)$(ptx/nl))
+
 	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules, *.ko,, n)
 	@$(call install_glob, kernel-malta, 0, 0, -, /lib/modules,, *.ko */build */source, n)
 
@@ -117,6 +138,16 @@ $(STATEDIR)/kernel-malta.targetinstall:
 
 	@$(call touch)
 
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/kernel-malta.clean:
+	@$(call targetinfo)
+	@$(call clean_pkg, KERNEL_MALTA)
+	@$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \
+		rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl))
+
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH v2 4/5] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5
  2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 2/5] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 3/5] mips, mipsel: kernel-*: rework device-tree handling Roland Hieber
@ 2021-11-26 10:39 ` Roland Hieber
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 5/5] mips, mipsel: update kernel configs Roland Hieber
  2021-11-26 10:47 ` [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Robert Schwebel
  4 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-11-26 10:39 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

These macros make sure that the version and MD5 result in the string
"undefined" when the respective package is not enabled in the menu.
See the following PTXdist commits:

 * commit 80d19e055622e87116df ("rules: new macros ptx/config-version and ptx/config-md5")
 * commit bc40d075ebcdf81cc14b ("kernel: use ptx/config-version and ptx/config-md5")

Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=80d19e055622e87116df
Link: https://git.pengutronix.de/cgit/ptxdist/commit/?id=bc40d075ebcdf81cc14b

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: no changes

 configs/platform-mips/rules/kernel-ar9331.make  | 4 ++--
 configs/platform-mips/rules/kernel-malta.make   | 4 ++--
 configs/platform-mipsel/rules/kernel-malta.make | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
index 7b9782d2b696..74c10ce22dfb 100644
--- a/configs/platform-mips/rules/kernel-ar9331.make
+++ b/configs/platform-mips/rules/kernel-ar9331.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_KERNEL_AR9331) += kernel-ar9331
 #
 # Paths and names
 #
-KERNEL_AR9331_VERSION	:= $(KERNEL_VERSION)
-KERNEL_AR9331_MD5	:= $(call remove_quotes,$(PTXCONF_KERNEL_MD5))
+KERNEL_AR9331_VERSION	:= $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_AR9331_MD5	:= $(call ptx/config-md5, PTXCONF_KERNEL)
 KERNEL_AR9331		:= linux-ar9331-$(KERNEL_AR9331_VERSION)
 KERNEL_AR9331_SUFFIX	:= tar.xz
 KERNEL_AR9331_URL	:= $(call kernel-url, KERNEL_AR9331)
diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
index c5028b996264..41e2760cd14a 100644
--- a/configs/platform-mips/rules/kernel-malta.make
+++ b/configs/platform-mips/rules/kernel-malta.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta
 #
 # Paths and names
 #
-KERNEL_MALTA_VERSION	:= $(KERNEL_VERSION)
-KERNEL_MALTA_MD5	:= $(call remove_quotes,$(PTXCONF_KERNEL_MD5))
+KERNEL_MALTA_VERSION	:= $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_MALTA_MD5	:= $(call ptx/config-md5, PTXCONF_KERNEL)
 KERNEL_MALTA		:= linux-malta-$(KERNEL_MALTA_VERSION)
 KERNEL_MALTA_SUFFIX	:= tar.xz
 KERNEL_MALTA_URL	:= $(call kernel-url, KERNEL_MALTA)
diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
index c2bea47e9d0c..89f1e06c529a 100644
--- a/configs/platform-mipsel/rules/kernel-malta.make
+++ b/configs/platform-mipsel/rules/kernel-malta.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta
 #
 # Paths and names
 #
-KERNEL_MALTA_VERSION	:= $(KERNEL_VERSION)
-KERNEL_MALTA_MD5	:= $(call remove_quotes,$(PTXCONF_KERNEL_MD5))
+KERNEL_MALTA_VERSION	:= $(call ptx/config-version, PTXCONF_KERNEL)
+KERNEL_MALTA_MD5	:= $(call ptx/config-md5, PTXCONF_KERNEL)
 KERNEL_MALTA		:= linux-malta-$(KERNEL_MALTA_VERSION)
 KERNEL_MALTA_SUFFIX	:= tar.xz
 KERNEL_MALTA_URL	:= $(call kernel-url, KERNEL_MALTA)
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [DistroKit] [PATCH v2 5/5] mips, mipsel: update kernel configs
  2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
                   ` (2 preceding siblings ...)
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 4/5] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5 Roland Hieber
@ 2021-11-26 10:39 ` Roland Hieber
  2021-11-26 10:47 ` [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Robert Schwebel
  4 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2021-11-26 10:39 UTC (permalink / raw)
  To: distrokit; +Cc: Roland Hieber

GCC plugins are now properly disabled again.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2: drop previous patches to kernel.make

 configs/platform-mips/kernelconfig-ar9331       | 1 -
 configs/platform-mips/kernelconfig-ar9331.diff  | 1 +
 configs/platform-mips/kernelconfig-malta        | 1 -
 configs/platform-mips/kernelconfig-malta.diff   | 1 +
 configs/platform-mipsel/kernelconfig            | 1 -
 configs/platform-mipsel/kernelconfig-malta      | 1 -
 configs/platform-mipsel/kernelconfig-malta.diff | 2 +-
 7 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configs/platform-mips/kernelconfig-ar9331 b/configs/platform-mips/kernelconfig-ar9331
index a4d3e0a39b57..8acc1a577377 100644
--- a/configs/platform-mips/kernelconfig-ar9331
+++ b/configs/platform-mips/kernelconfig-ar9331
@@ -478,7 +478,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
diff --git a/configs/platform-mips/kernelconfig-ar9331.diff b/configs/platform-mips/kernelconfig-ar9331.diff
index 41c0d6fd0d8a..2a6b97ce9481 100644
--- a/configs/platform-mips/kernelconfig-ar9331.diff
+++ b/configs/platform-mips/kernelconfig-ar9331.diff
@@ -8,6 +8,7 @@
 CONFIG_BLK_SCSI_REQUEST=y
 # CONFIG_BSD_DISKLABEL is undefined
 # CONFIG_CMDLINE_PARTITION is undefined
+# CONFIG_GCC_PLUGINS is undefined
 # CONFIG_KARMA_PARTITION is undefined
 # CONFIG_LDM_PARTITION is undefined
 CONFIG_LOCALVERSION="-ar9331"
diff --git a/configs/platform-mips/kernelconfig-malta b/configs/platform-mips/kernelconfig-malta
index 34867d0fde2d..80a06bf7226d 100644
--- a/configs/platform-mips/kernelconfig-malta
+++ b/configs/platform-mips/kernelconfig-malta
@@ -547,7 +547,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff
index 07dda18f522c..eef0cc594ec2 100644
--- a/configs/platform-mips/kernelconfig-malta.diff
+++ b/configs/platform-mips/kernelconfig-malta.diff
@@ -376,6 +376,7 @@
 CONFIG_FWNODE_MDIO=m
 CONFIG_GACT_PROB=y
 CONFIG_GARP=m
+# CONFIG_GCC_PLUGINS is undefined
 CONFIG_GENERIC_IRQ_IPI=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_PINCONF is undefined
diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
index ed1d57928562..71d5d04a96f3 100644
--- a/configs/platform-mipsel/kernelconfig
+++ b/configs/platform-mipsel/kernelconfig
@@ -484,7 +484,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
index d72745a1148e..10710077eb2b 100644
--- a/configs/platform-mipsel/kernelconfig-malta
+++ b/configs/platform-mipsel/kernelconfig-malta
@@ -539,7 +539,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # end of GCOV-based kernel profiling
 
 CONFIG_HAVE_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGINS is not set
 # end of General architecture-dependent options
 
 CONFIG_RT_MUTEXES=y
diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
index 436792419c0e..4fbaac22dd96 100644
--- a/configs/platform-mipsel/kernelconfig-malta.diff
+++ b/configs/platform-mipsel/kernelconfig-malta.diff
@@ -1,4 +1,4 @@
-5f63546ba13779edf8b16ebf51268bd9
+74ef80b509aa881a4e93d2bd7522961a
 CONFIG_32BIT=y
 # CONFIG_3C515 is undefined
 # CONFIG_64BIT is undefined
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH
  2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
                   ` (3 preceding siblings ...)
  2021-11-26 10:39 ` [DistroKit] [PATCH v2 5/5] mips, mipsel: update kernel configs Roland Hieber
@ 2021-11-26 10:47 ` Robert Schwebel
  4 siblings, 0 replies; 6+ messages in thread
From: Robert Schwebel @ 2021-11-26 10:47 UTC (permalink / raw)
  To: Roland Hieber; +Cc: distrokit

Applied series to next

On Fri, Nov 26, 2021 at 11:39:33AM +0100, Roland Hieber wrote:
> Even if this is currently unused, having this variable like in the
> PTXdist template prevents confusion when backporting patches from the
> template to the BSP recipes.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> v2: no changes
> 
>  configs/platform-mips/rules/kernel-ar9331.make  | 1 +
>  configs/platform-mips/rules/kernel-malta.make   | 1 +
>  configs/platform-mipsel/rules/kernel-malta.make | 1 +
>  3 files changed, 3 insertions(+)
> 
> diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make
> index 98452a90a0a4..7893431abeaf 100644
> --- a/configs/platform-mips/rules/kernel-ar9331.make
> +++ b/configs/platform-mips/rules/kernel-ar9331.make
> @@ -36,6 +36,7 @@ KERNEL_AR9331_BUILD_OOT	:= KEEP
>  KERNEL_AR9331_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +KERNEL_AR9331_PATH	:= PATH=$(CROSS_PATH)
>  KERNEL_AR9331_CONF_OPT	:= \
>  	-C $(KERNEL_AR9331_DIR) \
>  	O=$(KERNEL_AR9331_BUILD_DIR) \
> diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make
> index cfb387442d41..f93262cbccd1 100644
> --- a/configs/platform-mips/rules/kernel-malta.make
> +++ b/configs/platform-mips/rules/kernel-malta.make
> @@ -36,6 +36,7 @@ KERNEL_MALTA_BUILD_OOT	:= KEEP
>  KERNEL_MALTA_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
>  KERNEL_MALTA_CONF_OPT	:= \
>  	-C $(KERNEL_MALTA_DIR) \
>  	O=$(KERNEL_MALTA_BUILD_DIR) \
> diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make
> index cfb387442d41..f93262cbccd1 100644
> --- a/configs/platform-mipsel/rules/kernel-malta.make
> +++ b/configs/platform-mipsel/rules/kernel-malta.make
> @@ -36,6 +36,7 @@ KERNEL_MALTA_BUILD_OOT	:= KEEP
>  KERNEL_MALTA_WRAPPER_BLACKLIST := \
>  	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
>  
> +KERNEL_MALTA_PATH		:= PATH=$(CROSS_PATH)
>  KERNEL_MALTA_CONF_OPT	:= \
>  	-C $(KERNEL_MALTA_DIR) \
>  	O=$(KERNEL_MALTA_BUILD_DIR) \
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> DistroKit mailing list
> DistroKit@pengutronix.de
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-26 10:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-26 10:39 [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
2021-11-26 10:39 ` [DistroKit] [PATCH v2 2/5] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template Roland Hieber
2021-11-26 10:39 ` [DistroKit] [PATCH v2 3/5] mips, mipsel: kernel-*: rework device-tree handling Roland Hieber
2021-11-26 10:39 ` [DistroKit] [PATCH v2 4/5] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5 Roland Hieber
2021-11-26 10:39 ` [DistroKit] [PATCH v2 5/5] mips, mipsel: update kernel configs Roland Hieber
2021-11-26 10:47 ` [DistroKit] [PATCH v2 1/5] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Robert Schwebel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox