From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 13 Aug 2024 15:21:08 +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 1sdrSW-009CxB-25 for lore@lore.pengutronix.de; Tue, 13 Aug 2024 15:21:08 +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 1sdrSV-0007mc-TF; Tue, 13 Aug 2024 15:21:07 +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 1sdrSI-0007Tl-F9; Tue, 13 Aug 2024 15:20:54 +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 1sdrSH-0008L7-Sk; Tue, 13 Aug 2024 15:20:53 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1sdrSH-00GQQL-2h; Tue, 13 Aug 2024 15:20:53 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Tue, 13 Aug 2024 15:20:47 +0200 Message-Id: <20240813132050.3914043-7-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813132050.3914043-1-rhi@pengutronix.de> References: <20240801113819.3981009-1-a.fatoum@pengutronix.de> <20240813132050.3914043-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox 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 With a bit of hackery in barebox.noexec.make, we can use the upstream barebox package to provide a REF_CONFIG for the other barebox packages. The slight disadvantage is that its targetinstall stage creates an empty barebox-default-environment file in the image folder, but the big advantage is that we can save maintaining a custom rule. Signed-off-by: Roland Hieber --- configs/platform-mips/platformconfig | 30 +++++-- .../platforms/barebox-0-common.in | 33 -------- .../platform-mips/platforms/barebox-ar9331.in | 2 +- .../platform-mips/platforms/barebox-malta.in | 2 +- .../platform-mips/rules/barebox-ar9331.make | 4 +- .../platform-mips/rules/barebox-common.make | 84 ------------------- .../platform-mips/rules/barebox-malta.make | 4 +- .../platform-mips/rules/barebox.noexec.make | 7 ++ configs/platform-mipsel/platformconfig | 30 +++++-- .../platforms/barebox-0-common.in | 33 -------- .../platforms/barebox-malta.in | 2 +- .../platform-mipsel/rules/barebox-common.make | 84 ------------------- .../platform-mipsel/rules/barebox-malta.make | 4 +- .../platform-mipsel/rules/barebox.noexec.make | 7 ++ 14 files changed, 71 insertions(+), 255 deletions(-) delete mode 100644 configs/platform-mips/platforms/barebox-0-common.in delete mode 100644 configs/platform-mips/rules/barebox-common.make create mode 100644 configs/platform-mips/rules/barebox.noexec.make delete mode 100644 configs/platform-mipsel/platforms/barebox-0-common.in delete mode 100644 configs/platform-mipsel/rules/barebox-common.make create mode 100644 configs/platform-mipsel/rules/barebox.noexec.make diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 6a7cab8ef6a7..fc7b10c2587b 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -170,16 +170,34 @@ PTXCONF_KERNEL_MALTA=y # bootloaders # # PTXCONF_AT91BOOTSTRAP2 is not set -PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips" -PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2021.02.0" -PTXCONF_BAREBOX_COMMON_MD5="07045e34faa1135d9cd18503186b2d7f" -PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AR9331=y PTXCONF_BAREBOX_MALTA=y PTXCONF_BAREBOX_ARCH_STRING="mips" -# PTXCONF_BAREBOX is not set +PTXCONF_BAREBOX_DEPENDENCIES=y +PTXCONF_BAREBOX=y +PTXCONF_BAREBOX_VERSION="2021.02.0" +# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set +PTXCONF_BAREBOX_MD5="07045e34faa1135d9cd18503186b2d7f" +PTXCONF_BAREBOX_CONFIG="barebox.config" +# PTXCONF_BAREBOX_FIRMWARE is not set +# PTXCONF_BAREBOX_EXTRA_ENV is not set +# PTXCONF_BAREBOX_BAREBOXENV is not set +# PTXCONF_BAREBOX_INSTALL_DTBS is not set +# PTXCONF_BAREBOX_BAREBOXCRC32 is not set +# PTXCONF_BAREBOX_KERNEL_INSTALL is not set +# PTXCONF_BAREBOX_BAREBOXIMD is not set + +# +# build dependencies +# +# PTXCONF_BAREBOX_NEEDS_HOST_LIBUSB is not set +# PTXCONF_BAREBOX_NEEDS_HOST_OPENSSL is not set +# PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set +# PTXCONF_BAREBOX_NEEDS_KEYS is not set +PTXCONF_BAREBOX_NEEDS_HOST_LZOP=y +# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set # PTXCONF_BAREBOX_MLO is not set +PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_U_BOOT is not set diff --git a/configs/platform-mips/platforms/barebox-0-common.in b/configs/platform-mips/platforms/barebox-0-common.in deleted file mode 100644 index 0b487ba3bdea..000000000000 --- a/configs/platform-mips/platforms/barebox-0-common.in +++ /dev/null @@ -1,33 +0,0 @@ -## SECTION=bootloader - -config BAREBOX_COMMON_ARCH_STRING - string - default "mips" - -menuconfig BAREBOX_COMMON - prompt "common barebox options " - bool - select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP - help - A metapackage serving a reference config for all other barebox - variants in the v7a platform. It doesn't install anything. - -if BAREBOX_COMMON - -config BAREBOX_COMMON_VERSION - prompt "barebox version" - string - default "2016.08.0" - -config BAREBOX_COMMON_MD5 - prompt "barebox source md5sum" - string - -config BAREBOX_COMMON_NEEDS_HOST_LZOP - prompt "barebox needs lzop" - bool - help - The barebox binaries can be compressed. Select this if lzop - is used in order to compile lzop for your development host. - -endif diff --git a/configs/platform-mips/platforms/barebox-ar9331.in b/configs/platform-mips/platforms/barebox-ar9331.in index b54fc44693c0..5f22bd160fd0 100644 --- a/configs/platform-mips/platforms/barebox-ar9331.in +++ b/configs/platform-mips/platforms/barebox-ar9331.in @@ -3,6 +3,6 @@ config BAREBOX_AR9331 tristate prompt "Barebox (ar9331)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mips/platforms/barebox-malta.in b/configs/platform-mips/platforms/barebox-malta.in index 6976a961f31d..3388a67c13dc 100644 --- a/configs/platform-mips/platforms/barebox-malta.in +++ b/configs/platform-mips/platforms/barebox-malta.in @@ -3,6 +3,6 @@ config BAREBOX_MALTA tristate prompt "Barebox (malta)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index 3cc949555f75..c769d2111978 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331 # # Paths and names # -BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) +BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) +BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SUFFIX := tar.bz2 BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331) diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make deleted file mode 100644 index 4411dbebd35f..000000000000 --- a/configs/platform-mips/rules/barebox-common.make +++ /dev/null @@ -1,84 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2019 Roland Hieber -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common - -# -# Paths and names -# -BAREBOX_COMMON_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_COMMON_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) -BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SUFFIX := tar.bz2 -BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) -BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX) -BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON) -BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build -BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_COMMON_LICENSE := GPL-2.0-only -BAREBOX_COMMON_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# use host pkg-config for host tools -BAREBOX_COMMON_PATH := PATH=$(HOST_PATH) - -BAREBOX_COMMON_CONF_OPT := \ - -C $(BAREBOX_COMMON_DIR) \ - O=$(BAREBOX_COMMON_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ - $(call barebox-opts, BAREBOX_COMMON) - -BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT) - -BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope - -ifdef PTXCONF_BAREBOX_COMMON -$(BAREBOX_COMMON_CONFIG): - @echo - @echo "****************************************************************************" - @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'" - @echo "****************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@)) - -barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, oldconfig) - -# vim: syntax=make diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index 31b0b066e332..ae4dcfe8d6e4 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) +BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) +BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) diff --git a/configs/platform-mips/rules/barebox.noexec.make b/configs/platform-mips/rules/barebox.noexec.make new file mode 100644 index 000000000000..76b4a4f78126 --- /dev/null +++ b/configs/platform-mips/rules/barebox.noexec.make @@ -0,0 +1,7 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +BAREBOX_MAKE_ENV=: + +# don't error out when trying to copy the defaultenv in the targetinstall stage +$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env +$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile + mkdir -p "$(dir $@)" && touch $@ diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig index d69bab59bdd1..e71cbcd27f71 100644 --- a/configs/platform-mipsel/platformconfig +++ b/configs/platform-mipsel/platformconfig @@ -169,15 +169,33 @@ PTXCONF_KERNEL_MALTA=y # bootloaders # # PTXCONF_AT91BOOTSTRAP2 is not set -PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips" -PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2021.06.0" -PTXCONF_BAREBOX_COMMON_MD5="62d995d4b70c7007800e688ac6ca80df" -PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_MALTA=y PTXCONF_BAREBOX_ARCH_STRING="mips" -# PTXCONF_BAREBOX is not set +PTXCONF_BAREBOX_DEPENDENCIES=y +PTXCONF_BAREBOX=y +PTXCONF_BAREBOX_VERSION="2021.06.0" +# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set +PTXCONF_BAREBOX_MD5="62d995d4b70c7007800e688ac6ca80df" +PTXCONF_BAREBOX_CONFIG="barebox.config" +# PTXCONF_BAREBOX_FIRMWARE is not set +# PTXCONF_BAREBOX_EXTRA_ENV is not set +# PTXCONF_BAREBOX_BAREBOXENV is not set +# PTXCONF_BAREBOX_INSTALL_DTBS is not set +# PTXCONF_BAREBOX_BAREBOXCRC32 is not set +# PTXCONF_BAREBOX_KERNEL_INSTALL is not set +# PTXCONF_BAREBOX_BAREBOXIMD is not set + +# +# build dependencies +# +# PTXCONF_BAREBOX_NEEDS_HOST_LIBUSB is not set +# PTXCONF_BAREBOX_NEEDS_HOST_OPENSSL is not set +# PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set +# PTXCONF_BAREBOX_NEEDS_KEYS is not set +PTXCONF_BAREBOX_NEEDS_HOST_LZOP=y +# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set # PTXCONF_BAREBOX_MLO is not set +PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_U_BOOT is not set diff --git a/configs/platform-mipsel/platforms/barebox-0-common.in b/configs/platform-mipsel/platforms/barebox-0-common.in deleted file mode 100644 index 0b487ba3bdea..000000000000 --- a/configs/platform-mipsel/platforms/barebox-0-common.in +++ /dev/null @@ -1,33 +0,0 @@ -## SECTION=bootloader - -config BAREBOX_COMMON_ARCH_STRING - string - default "mips" - -menuconfig BAREBOX_COMMON - prompt "common barebox options " - bool - select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP - help - A metapackage serving a reference config for all other barebox - variants in the v7a platform. It doesn't install anything. - -if BAREBOX_COMMON - -config BAREBOX_COMMON_VERSION - prompt "barebox version" - string - default "2016.08.0" - -config BAREBOX_COMMON_MD5 - prompt "barebox source md5sum" - string - -config BAREBOX_COMMON_NEEDS_HOST_LZOP - prompt "barebox needs lzop" - bool - help - The barebox binaries can be compressed. Select this if lzop - is used in order to compile lzop for your development host. - -endif diff --git a/configs/platform-mipsel/platforms/barebox-malta.in b/configs/platform-mipsel/platforms/barebox-malta.in index 6976a961f31d..3388a67c13dc 100644 --- a/configs/platform-mipsel/platforms/barebox-malta.in +++ b/configs/platform-mipsel/platforms/barebox-malta.in @@ -3,6 +3,6 @@ config BAREBOX_MALTA tristate prompt "Barebox (malta)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mipsel/rules/barebox-common.make b/configs/platform-mipsel/rules/barebox-common.make deleted file mode 100644 index d0caead4ac40..000000000000 --- a/configs/platform-mipsel/rules/barebox-common.make +++ /dev/null @@ -1,84 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2019 Roland Hieber -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common - -# -# Paths and names -# -BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) -BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SUFFIX := tar.bz2 -BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) -BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX) -BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON) -BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build -BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_COMMON_LICENSE := GPL-2.0-only -BAREBOX_COMMON_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# use host pkg-config for host tools -BAREBOX_COMMON_PATH := PATH=$(HOST_PATH) - -BAREBOX_COMMON_CONF_OPT := \ - -C $(BAREBOX_COMMON_DIR) \ - O=$(BAREBOX_COMMON_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ - $(call barebox-opts, BAREBOX_COMMON) - -BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT) - -BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope - -ifdef PTXCONF_BAREBOX_COMMON -$(BAREBOX_COMMON_CONFIG): - @echo - @echo "****************************************************************************" - @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'" - @echo "****************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@)) - -barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, oldconfig) - -# vim: syntax=make diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index d9a63fa13fbf..ec40264bdc48 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) +BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5)) BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) diff --git a/configs/platform-mipsel/rules/barebox.noexec.make b/configs/platform-mipsel/rules/barebox.noexec.make new file mode 100644 index 000000000000..76b4a4f78126 --- /dev/null +++ b/configs/platform-mipsel/rules/barebox.noexec.make @@ -0,0 +1,7 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +BAREBOX_MAKE_ENV=: + +# don't error out when trying to copy the defaultenv in the targetinstall stage +$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env +$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile + mkdir -p "$(dir $@)" && touch $@ -- 2.39.2