From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 08 Aug 2024 14:28:57 +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 1sc2GH-007Uap-0T for lore@lore.pengutronix.de; Thu, 08 Aug 2024 14:28:57 +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 1sc2GG-0006GU-EC; Thu, 08 Aug 2024 14:28:56 +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 1sc2G8-0005yN-GU; Thu, 08 Aug 2024 14:28:48 +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 1sc2G7-005QKT-Sl; Thu, 08 Aug 2024 14:28:47 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sc2G7-008U5m-2b; Thu, 08 Aug 2024 14:28:47 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Thu, 8 Aug 2024 14:28:45 +0200 Message-Id: <20240808122846.2022136-9-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240808122846.2022136-1-rhi@pengutronix.de> References: <20240731091435.2983175-1-rhi@pengutronix.de> <20240808122846.2022136-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v2 09/10] mips, mipsel: barebox-*: use ptx/image-install 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 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 --- .../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