From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Aug 2024 15:21:06 +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 1sdrSU-009Cvq-0F for lore@lore.pengutronix.de; Tue, 13 Aug 2024 15:21:06 +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 1sdrST-0007Yo-BS; Tue, 13 Aug 2024 15:21:05 +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 1sdrSI-0007Tj-DA; Tue, 13 Aug 2024 15:20:54 +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 1sdrSH-0008L5-Rw; Tue, 13 Aug 2024 15:20:53 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sdrSH-00GQQF-2d; Tue, 13 Aug 2024 15:20:53 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 13 Aug 2024 15:20:45 +0200 Message-Id: <20240813132050.3914043-5-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813132050.3914043-1-rhi@pengutronix.de> References: <20240801113819.3981009-1-a.fatoum@pengutronix.de> <20240813132050.3914043-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false The clean stage did not clean up the installed kernel images from the image directory, but if we use ptx/image-install to install them, this can all be done by PTXdist's default clean stage. That macro now also prints the installed images, so we don't need to echo them. Forwarded: https://lore.ptxdist.org/ptxdist/20240808093643.1634147-1-rhi@pengutronix.de Signed-off-by: Roland Hieber --- .../platform-mips/rules/kernel-ar9331.make | 23 ++++++------------- configs/platform-mips/rules/kernel-malta.make | 23 ++++++------------- .../platform-mipsel/rules/kernel-malta.make | 23 ++++++------------- 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index 0b3a3a1c3d33..a711e756118c 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-ar9331.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_AR9331_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl)) + $(call ptx/image-install, KERNEL_AR9331, \ + $(image), \ + $(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)) + @$(foreach dtb, $(KERNEL_AR9331_DTB_FILES), \ + $(call ptx/image-install, KERNEL_AR9331, \ + $(KERNEL_AR9331_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-ar9331) @$(call install_fixup, kernel-ar9331, PRIORITY,optional) @@ -143,16 +144,6 @@ $(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 8dc3ce79f5c2..badcff469994 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + $(call ptx/image-install, KERNEL_MALTA, \ + $(image), \ + $(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)) + @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \ + $(call ptx/image-install, KERNEL_MALTA, \ + $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @@ -143,16 +144,6 @@ $(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 8dc3ce79f5c2..badcff469994 100644 --- a/configs/platform-mipsel/rules/kernel-malta.make +++ b/configs/platform-mipsel/rules/kernel-malta.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + $(call ptx/image-install, KERNEL_MALTA, \ + $(image), \ + $(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)) + @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \ + $(call ptx/image-install, KERNEL_MALTA, \ + $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @@ -143,16 +144,6 @@ $(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.39.2