From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Apr 2022 12:54:03 +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 1ncPm8-00ALqL-IH for lore@lore.pengutronix.de; Thu, 07 Apr 2022 12:54:03 +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-0000tj-3Q; 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-0000sp-1a; 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-001aqj-Q1; 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-005Gxz-NA; Thu, 07 Apr 2022 12:53:53 +0200 From: Oleksij Rempel To: distrokit@pengutronix.de Date: Thu, 7 Apr 2022 12:53:50 +0200 Message-Id: <20220407105352.1256734-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220407105352.1256734-1-o.rempel@pengutronix.de> References: <20220407105352.1256734-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: 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-at91 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 --- .../rules/barebox-at91.make | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/configs/platform-v7a_noneon/rules/barebox-at91.make b/configs/platform-v7a_noneon/rules/barebox-at91.make index 1079b28..66d951e 100644 --- a/configs/platform-v7a_noneon/rules/barebox-at91.make +++ b/configs/platform-v7a_noneon/rules/barebox-at91.make @@ -14,41 +14,43 @@ PACKAGES-$(PTXCONF_BAREBOX_AT91) += barebox-at91 # # Paths and names # -BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) BAREBOX_AT91_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) -BAREBOX_AT91 := barebox-$(BAREBOX_AT91_VERSION) -BAREBOX_AT91_SUFFIX := tar.bz2 -BAREBOX_AT91_DIR := $(BUILDDIR)/barebox-at91-$(BAREBOX_AT91_VERSION) -BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config) -BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_AT91_LICENSE := GPL-2.0 +BAREBOX_AT91 := barebox-at91-$(BAREBOX_AT91_VERSION) +BAREBOX_AT91_SUFFIX := tar.bz2 BAREBOX_AT91_URL := $(call barebox-url, BAREBOX_AT91) -BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91).$(BAREBOX_AT91_SUFFIX) +BAREBOX_AT91_PATCHES := barebox-$(BAREBOX_AT91_VERSION) +BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX) +BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91) +BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build +BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config) +BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) +BAREBOX_AT91_LICENSE := GPL-2.0-only +BAREBOX_AT91_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- +# use host pkg-config for host tools +BAREBOX_AT91_PATH := PATH=$(HOST_PATH) + BAREBOX_AT91_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AT91_CONF_ENV := KCONFIG_NOTIMESTAMP=1 BAREBOX_AT91_CONF_OPT := \ + -C $(BAREBOX_AT91_DIR) \ + O=$(BAREBOX_AT91_BUILD_DIR) \ BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_AT91) -BAREBOX_AT91_MAKE_ENV := $(BAREBOX_AT91_CONF_ENV) BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT) BAREBOX_AT91_IMAGES := \ images/barebox-microchip-ksz9477-evb.img \ images/barebox-microchip-ksz9477-evb-xload-mmc.img -BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_DIR)/,$(BAREBOX_AT91_IMAGES)) +BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_BUILD_DIR)/,$(BAREBOX_AT91_IMAGES)) ifdef PTXCONF_BAREBOX_AT91 $(BAREBOX_AT91_CONFIG): @@ -96,7 +98,7 @@ $(STATEDIR)/barebox-at91.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_AT91) @$(foreach image, $(BAREBOX_AT91_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))-at91;) + rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig -- 2.30.2 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de