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 v2 09/10] mips, mipsel: barebox-*: use ptx/image-install
Date: Thu,  8 Aug 2024 14:28:45 +0200	[thread overview]
Message-ID: <20240808122846.2022136-9-rhi@pengutronix.de> (raw)
In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de>

The images installed by ptx/image-install are automatically cleaned up
by PTXdist's default clean stage.

Forwarded: https://lore.ptxdist.org/ptxdist/20240802102529.1411407-2-rhi@pengutronix.de/
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 .../platform-mips/rules/barebox-ar9331.make   | 24 ++++++------------
 .../platform-mips/rules/barebox-malta.make    | 25 +++++++------------
 .../platform-mipsel/rules/barebox-malta.make  | 25 +++++++------------
 3 files changed, 26 insertions(+), 48 deletions(-)

diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make
index 8627f19c5e79..714f3191f688 100644
--- a/configs/platform-mips/rules/barebox-ar9331.make
+++ b/configs/platform-mips/rules/barebox-ar9331.make
@@ -85,24 +85,16 @@ $(STATEDIR)/barebox-ar9331.install:
 $(STATEDIR)/barebox-ar9331.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_AR9331_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-ar9331
-	@install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb $(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb
+		$(call ptx/image-install, BAREBOX_AR9331, $(image), \
+			$(notdir $(image))-ar9331)$(ptx/nl))
+	@$(call ptx/image-install, BAREBOX_AR9331, \
+		$(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env, \
+		barebox-zero-env-ar9331)
+	@$(call ptx/image-install, BAREBOX_AR9331, \
+		$(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb, \
+		ar9331-dptechnics-dpt-module.dtb)
 	@$(call touch)
 
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-ar9331.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_AR9331)
-	@$(foreach image, $(BAREBOX_AR9331_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@rm -vf $(IMAGEDIR)/barebox-zero-env-ar9331 \
-		$(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb
-
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
 # ----------------------------------------------------------------------------
diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make
index 281f3338504b..ff594480db7d 100644
--- a/configs/platform-mips/rules/barebox-malta.make
+++ b/configs/platform-mips/rules/barebox-malta.make
@@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install:
 $(STATEDIR)/barebox-malta.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta
-	@install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
+		$(call ptx/image-install, BAREBOX_MALTA, $(image), \
+			$(notdir $(image))-malta)$(ptx/nl))
+	@$(call ptx/image-install, BAREBOX_MALTA, \
+		$(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \
+		barebox-zero-env-malta)
+	@$(call ptx/image-install, BAREBOX_MALTA, \
+		$(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \
+		qemu-malta.dtb-bb)
 
-$(STATEDIR)/barebox-malta.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_MALTA)
-	@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@rm -vf $(IMAGEDIR)/barebox-zero-env-malta \
-		$(IMAGEDIR)/qemu-malta.dtb-bb
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make
index 93502441fc0d..64be579ea1a5 100644
--- a/configs/platform-mipsel/rules/barebox-malta.make
+++ b/configs/platform-mipsel/rules/barebox-malta.make
@@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install:
 $(STATEDIR)/barebox-malta.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
-		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta
-	@install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
+		$(call ptx/image-install, BAREBOX_MALTA, $(image), \
+			$(notdir $(image))-malta)$(ptx/nl))
+	@$(call ptx/image-install, BAREBOX_MALTA, \
+		$(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \
+		barebox-zero-env-malta)
+	@$(call ptx/image-install, BAREBOX_MALTA, \
+		$(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \
+		qemu-malta.dtb-bb)
 
-$(STATEDIR)/barebox-malta.clean:
-	@$(call targetinfo)
-	@$(call clean_pkg, BAREBOX_MALTA)
-	@$(foreach image, $(BAREBOX_MALTA_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-	@rm -vf $(IMAGEDIR)/barebox-zero-env-malta \
-		$(IMAGEDIR)/qemu-malta.dtb-bb
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
-- 
2.39.2




  parent reply	other threads:[~2024-08-08 12:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-31  9:14 [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Roland Hieber
2024-07-31  9:14 ` [DistroKit] [PATCH 2/2] mipsel: remove forked host-qemu rule Roland Hieber
2024-07-31 11:42 ` [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig Robert Schwebel
2024-07-31 12:07 ` Alexander Dahl
2024-07-31 12:10 ` Michael Olbrich
2024-07-31 12:23   ` Roland Hieber
2024-07-31 12:33     ` Robert Schwebel
2024-08-08 12:28 ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 02/10] mipsel: sync kernelconfig Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 03/10] mips, mipsel: remove forked kernel rule Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 04/10] mips, mipsel: kernel-*: sync with template Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 05/10] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 06/10] mips, mipsel: kernel-*: select KERNEL Roland Hieber
2024-08-08 13:41     ` Michael Olbrich
2024-08-13 13:23       ` Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 07/10] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber
2024-08-08 12:28   ` [DistroKit] [PATCH v2 08/10] mips, mipsel: barebox-*: sync with template Roland Hieber
2024-08-08 12:28   ` Roland Hieber [this message]
2024-08-08 12:28   ` [DistroKit] [PATCH v2 10/10] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber
2024-08-08 12:32   ` [DistroKit] [PATCH v2 01/10] mipsel: remove forked host-qemu rule 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=20240808122846.2022136-9-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