From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Apr 2022 12:54:04 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ncPm9-00ALqN-LO for lore@lore.pengutronix.de; Thu, 07 Apr 2022 12:54:04 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ncPm6-0000vI-D1; Thu, 07 Apr 2022 12:54:02 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ncPlz-0000sr-4i; Thu, 07 Apr 2022 12:53:55 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ncPlz-001aqp-TA; Thu, 07 Apr 2022 12:53:54 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ncPlx-005Gxu-Mr; Thu, 07 Apr 2022 12:53:53 +0200 From: Oleksij Rempel To: distrokit@pengutronix.de Date: Thu, 7 Apr 2022 12:53:49 +0200 Message-Id: <20220407105352.1256734-1-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: build out of three 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: Oleksij Rempel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- .../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