mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 3/2] templates: kernel: use ptx/image-install and fix clean stage
Date: Thu,  8 Aug 2024 11:36:43 +0200	[thread overview]
Message-ID: <20240808093643.1634147-1-rhi@pengutronix.de> (raw)
In-Reply-To: <20240802102529.1411407-1-rhi@pengutronix.de>

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 <rhi@pengutronix.de>
---
… 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




  parent reply	other threads:[~2024-08-08  9:37 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-02 10:25 [ptxdist] [PATCH 1/2] barebox: remove superfluous ptxd_source_kconfig calls Roland Hieber
2024-08-02 10:25 ` [ptxdist] [PATCH 2/2] templates: barebox: use ptx/image-install Roland Hieber
2024-09-12 12:11   ` [ptxdist] [APPLIED] " Michael Olbrich
2024-08-08  9:36 ` Roland Hieber [this message]
2024-09-12 12:11   ` [ptxdist] [APPLIED] templates: kernel: use ptx/image-install and fix clean stage Michael Olbrich
2024-08-08 14:14 ` [ptxdist] [PATCH 1/2] barebox: remove superfluous ptxd_source_kconfig calls Michael Olbrich
2024-08-26 12:09   ` Roland Hieber
2024-09-06 14:03 ` Michael Olbrich
2024-09-06 14:05   ` Michael Olbrich

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=20240808093643.1634147-1-rhi@pengutronix.de \
    --to=rhi@pengutronix.de \
    --cc=ptxdist@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