From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage
Date: Tue, 13 Aug 2024 15:20:45 +0200 [thread overview]
Message-ID: <20240813132050.3914043-5-rhi@pengutronix.de> (raw)
In-Reply-To: <20240813132050.3914043-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.
Forwarded: https://lore.ptxdist.org/ptxdist/20240808093643.1634147-1-rhi@pengutronix.de
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
.../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
next prev parent reply other threads:[~2024-08-13 13:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 3/6] v7a_noneon: barebox: use ARM-optimized routines where appropriate Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 4/6] v7a_noneon: barebox: enable of_diff command Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 5/6] v7a_noneon: generate vexpress.norimg by default Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 Ahmad Fatoum
2024-08-08 13:01 ` Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template Roland Hieber
2024-08-13 13:20 ` Roland Hieber [this message]
2024-08-13 13:20 ` [DistroKit] [PATCH v3 5/9] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 7/9] mips, mipsel: barebox-*: sync with template Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 8/9] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber
2024-08-13 13:20 ` [DistroKit] [PATCH v3 9/9] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-14 7:55 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Robert Schwebel
2024-08-14 7:59 ` [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Robert Schwebel
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=20240813132050.3914043-5-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