From 632141700bd31cc3c28933f200e3f9be4209c490 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Thu, 7 Apr 2022 12:53:51 +0200 Subject: v7a: barebox-at91: build out of tree Sync barebox-at91 make file with other make variants and enable build out of tree, to avoid build conflicts if local_src is used. Signed-off-by: Oleksij Rempel Link: https://lore.pengutronix.de/20220407105352.1256734-3-o.rempel@pengutronix.de Signed-off-by: Robert Schwebel --- configs/platform-v7a/rules/barebox-at91.make | 42 +++++++++++++++------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'configs/platform-v7a') diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make index 8bb8b1d..9563a23 100644 --- a/configs/platform-v7a/rules/barebox-at91.make +++ b/configs/platform-v7a/rules/barebox-at91.make @@ -14,34 +14,36 @@ 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 := \ @@ -50,7 +52,7 @@ BAREBOX_AT91_IMAGES := \ images/barebox-groboards-sama5d27-giantboard.img \ images/barebox-groboards-sama5d27-giantboard-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): @@ -65,10 +67,10 @@ endif $(STATEDIR)/barebox-at91.prepare: $(BAREBOX_AT91_CONFIG) @$(call targetinfo) - @rm -f "$(BAREBOX_AT91_DIR)/.ptxdist-defaultenv" - @ln -s "$(call ptx/in-platformconfigdir, barebox-at91-defaultenv)" \ - "$(BAREBOX_AT91_DIR)/.ptxdist-defaultenv" @$(call world/prepare, BAREBOX_AT91) + @rm -f "$(BAREBOX_AT91_BUILD_DIR)/.ptxdist-defaultenv" + @ln -s "$(call ptx/in-platformconfigdir, barebox-at91-defaultenv)" \ + "$(BAREBOX_AT91_BUILD_DIR)/.ptxdist-defaultenv" @$(call touch) # ---------------------------------------------------------------------------- @@ -98,7 +100,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 -- cgit v1.2.3