DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Subject: [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: build out of three
Date: Thu,  7 Apr 2022 12:53:50 +0200	[thread overview]
Message-ID: <20220407105352.1256734-2-o.rempel@pengutronix.de> (raw)
In-Reply-To: <20220407105352.1256734-1-o.rempel@pengutronix.de>

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 <o.rempel@pengutronix.de>
---
 .../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


  reply	other threads:[~2022-04-07 10:54 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-07 10:53 [DistroKit] [PATCH v1 1/4] v7a: barebox-stm32mp: " Oleksij Rempel
2022-04-07 10:53 ` Oleksij Rempel [this message]
2022-04-07 19:18   ` [DistroKit] [PATCH v1 2/4] v7a_noneon: barebox-at91: " 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220407105352.1256734-2-o.rempel@pengutronix.de \
    --to=o.rempel@pengutronix.de \
    --cc=distrokit@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox