DistroKit Mailinglist
 help / color / mirror / Atom feed
* [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three
@ 2022-04-07 10:53 Oleksij Rempel
  2022-04-07 10:53 ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " Oleksij Rempel
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Oleksij Rempel @ 2022-04-07 10:53 UTC (permalink / raw)
  To: distrokit; +Cc: Oleksij Rempel

Sync barebox-stm32mp make file with other make variants and enable build
out of three, to avoid build conflicts if local_src is used.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 .../platform-v7a/rules/barebox-stm32mp.make   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
index 17548fa..0cedc47 100644
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ b/configs/platform-v7a/rules/barebox-stm32mp.make
@@ -16,32 +16,32 @@ PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp
 #
 BAREBOX_STM32MP_VERSION		:= $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
 BAREBOX_STM32MP_MD5		:= $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_STM32MP			:= barebox-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP			:= barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
 BAREBOX_STM32MP_SUFFIX		:= tar.bz2
-BAREBOX_STM32MP_DIR		:= $(BUILDDIR)/barebox-stm32mp-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP_URL		:= $(call barebox-url, BAREBOX_STM32MP)
+BAREBOX_STM32MP_PATCHES		:= barebox-$(BAREBOX_STM32MP_VERSION)
+BAREBOX_STM32MP_SOURCE		:= $(SRCDIR)/$(BAREBOX_STM32MP).$(BAREBOX_STM32MP_SUFFIX)
+BAREBOX_STM32MP_DIR		:= $(BUILDDIR)/$(BAREBOX_STM32MP)
+BAREBOX_STM32MP_BUILD_DIR	:= $(BAREBOX_STM32MP_DIR)-build
 BAREBOX_STM32MP_CONFIG		:= $(call ptx/in-platformconfigdir, barebox-stm32mp.config)
 BAREBOX_STM32MP_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox.config)
 BAREBOX_STM32MP_LICENSE		:= GPL-2.0
-BAREBOX_STM32MP_URL		:= $(call barebox-url, BAREBOX_STM32MP)
-BAREBOX_STM32MP_SOURCE		:= $(SRCDIR)/$(BAREBOX_STM32MP).$(BAREBOX_STM32MP_SUFFIX)
+BAREBOX_STM32MP_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 BAREBOX_STM32MP_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
 BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1
 BAREBOX_STM32MP_CONF_OPT := \
+	-C $(BAREBOX_STM32MP_DIR) \
+	O=$(BAREBOX_STM32MP_BUILD_DIR) \
 	BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
 	$(call barebox-opts, BAREBOX_STM32MP)
 
-BAREBOX_STM32MP_MAKE_ENV := $(BAREBOX_STM32MP_CONF_ENV)
 BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT)
 
 BAREBOX_STM32MP_IMAGES := \
@@ -49,7 +49,7 @@ BAREBOX_STM32MP_IMAGES := \
 	images/barebox-stm32mp15x-ev1.img \
 	images/barebox-stm32mp157c-lxa-mc1.img
 
-BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_DIR)/,$(BAREBOX_STM32MP_IMAGES))
+BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES))
 
 ifdef PTXCONF_BAREBOX_STM32MP
 $(BAREBOX_STM32MP_CONFIG):
@@ -97,7 +97,7 @@ $(STATEDIR)/barebox-stm32mp.clean:
 	@$(call targetinfo)
 	@$(call clean_pkg, BAREBOX_STM32MP)
 	@$(foreach image, $(BAREBOX_STM32MP_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))-stm32mp;)
+		rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2022-04-07 19:19 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Oleksij Rempel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " Oleksij Rempel
2022-04-07 19:18   ` Robert Schwebel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 3/4] v7a: " Oleksij Rempel
2022-04-07 19:19   ` Robert Schwebel
2022-04-07 10:53 ` [DistroKit] [PATCH v1 4/4] v7a_noneon: barebox-vexpress/common: run oldconfig Oleksij Rempel
2022-04-07 19:19   ` Robert Schwebel
2022-04-07 19:18 ` [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three Robert Schwebel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox