From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 08 Aug 2024 11:37:25 +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 1sbzaH-007S0h-1q for lore@lore.pengutronix.de; Thu, 08 Aug 2024 11:37:25 +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 1sbzaG-00085r-V9; Thu, 08 Aug 2024 11:37:24 +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 1sbzZt-00085R-15; Thu, 08 Aug 2024 11:37:01 +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 1sbzZs-005OVL-Ka; Thu, 08 Aug 2024 11:37:00 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sbzZs-006rAE-1t; Thu, 08 Aug 2024 11:37:00 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Date: Thu, 8 Aug 2024 11:36:43 +0200 Message-Id: <20240808093643.1634147-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240802102529.1411407-1-rhi@pengutronix.de> References: <20240802102529.1411407-1-rhi@pengutronix.de> MIME-Version: 1.0 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 3/2] templates: kernel: use ptx/image-install and fix clean stage X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-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. While at it, fix a misplaced space in the "foreach dtb" statement. Signed-off-by: Roland Hieber --- … oops, forgot to send this with the first series… rules/templates/template-kernel-make | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make index cd1b717c51ba..1497a0c2177a 100644 --- a/rules/templates/template-kernel-make +++ b/rules/templates/template-kernel-make @@ -114,13 +114,14 @@ $(STATEDIR)/kernel-@package@.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_@PACKAGE@_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-@package@$(ptx/nl)) + $(call ptx/image-install, KERNEL_@PACKAGE@, \ + $(image), \ + $(notdir $(image))-@package@$(ptx/nl))) - @$(foreach dtb ,$(KERNEL_@PACKAGE@_DTB_FILES), \ - echo -e "Installing $(dtb) ...\n"$(ptx/nl) \ - install -D -m0644 $(KERNEL_@PACKAGE@_PKGDIR)/boot/$(dtb) \ - $(IMAGEDIR)/$(dtb)$(ptx/nl)) + @$(foreach dtb, $(KERNEL_@PACKAGE@_DTB_FILES), \ + $(call ptx/image-install, KERNEL_@PACKAGE@, \ + $(KERNEL_@PACKAGE@_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-@package@) @$(call install_fixup, kernel-@package@, PRIORITY,optional) @@ -142,16 +143,6 @@ $(STATEDIR)/kernel-@package@.targetinstall: @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel-@package@.clean: - @$(call targetinfo) - @$(call clean_pkg, KERNEL_@PACKAGE@) - @$(foreach dtb,$(KERNEL_@PACKAGE@_DTB_FILES), \ - rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl)) - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- -- 2.39.2