DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH 2/8] mips, mipsel: kernel-*: bring up-to-date with PTXdist 2021.07.0 template
Date: Sun, 24 Oct 2021 21:45:28 +0200	[thread overview]
Message-ID: <20211024194534.6704-2-rhi@pengutronix.de> (raw)
In-Reply-To: <20211024194534.6704-1-rhi@pengutronix.de>

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>
---
 .../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


  reply	other threads:[~2021-10-24 19:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-24 19:45 [DistroKit] [PATCH 1/8] mips, mipsel: kernel-*: bring back KERNEL_*_PATH Roland Hieber
2021-10-24 19:45 ` Roland Hieber [this message]
2021-10-24 19:45 ` [DistroKit] [PATCH 3/8] mips, mipsel: kernel-*: rework device-tree handling Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 4/8] mips, mipsel: kernel-*: use ptx/config-version and ptx/config-md5 Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 5/8] ptxdist: migrate 2021.06.0 -> 2021.10.0 Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 6/8] mips, mipsel: kernel: re-fork from PTXdist 2021.10.0 Roland Hieber
2021-10-24 19:54   ` [DistroKit] [PATCH v2 " Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 7/8] mips, mipsel: don't actually compile the kernel Roland Hieber
2021-10-25  7:37   ` Michael Olbrich
2021-11-24 14:53     ` Robert Schwebel
2021-11-25 11:42       ` Roland Hieber
2021-10-24 19:45 ` [DistroKit] [PATCH 8/8] mips, mipsel: update kernel configs 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=20211024194534.6704-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