DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH 08/14] barebox-am335x: sync with latest barebox template
Date: Tue, 29 Oct 2019 12:28:55 +0100	[thread overview]
Message-ID: <20191029112901.3380-9-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191029112901.3380-1-m.olbrich@pengutronix.de>

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 .../platform-v7a/rules/barebox-am335x.make    | 55 ++++++++++---------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index 0b9d4589f6f6..f738f34c66be 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
 #
-# See CREDITS for details about who has contributed to this project.
-#
 # For further information about the PTXdist project and license conditions
 # see the README file.
 #
@@ -16,37 +14,40 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
 #
 # Paths and names
 #
-BAREBOX_AM335X_VERSION	:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
-BAREBOX_AM335X_MD5	:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_AM335X		:= barebox-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_SUFFIX	:= tar.bz2
-BAREBOX_AM335X_DIR	:= $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-am335x.config)
-BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_AM335X_LICENSE	:= GPL-2.0
-BAREBOX_AM335X_URL	:= $(call barebox-url, BAREBOX_AM335X)
-BAREBOX_AM335X_SOURCE	:= $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX)
+BAREBOX_AM335X_VERSION		:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_AM335X_MD5		:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
+BAREBOX_AM335X			:= barebox-am335x-$(BAREBOX_AM335X_VERSION)
+BAREBOX_AM335X_SUFFIX		:= tar.bz2
+BAREBOX_AM335X_URL		:= $(call barebox-url, BAREBOX_AM335X)
+BAREBOX_AM335X_PATCHES		:= barebox-$(BAREBOX_AM335X_VERSION)
+BAREBOX_AM335X_SOURCE		:= $(SRCDIR)/$(BAREBOX_AM335X_PATCHES).$(BAREBOX_AM335X_SUFFIX)
+BAREBOX_AM335X_DIR		:= $(BUILDDIR)/$(BAREBOX_AM335X)
+BAREBOX_AM335X_BUILD_DIR	:= $(BAREBOX_AM335X_DIR)-build
+BAREBOX_AM335X_CONFIG		:= $(call ptx/in-platformconfigdir, barebox-am335x.config)
+BAREBOX_AM335X_REF_CONFIG	:= $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AM335X_LICENSE		:= GPL-2.0-only
+BAREBOX_AM335X_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
+# use host pkg-config for host tools
+BAREBOX_AM335X_PATH := PATH=$(HOST_PATH)
+
 BAREBOX_AM335X_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_AM335X_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_AM335X_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X)
+BAREBOX_AM335X_CONF_OPT := \
+	-C $(BAREBOX_AM335X_DIR) \
+	O=$(BAREBOX_AM335X_BUILD_DIR) \
+	$(call barebox-opts, BAREBOX_AM335X)
 
-BAREBOX_AM335X_MAKE_ENV := $(BAREBOX_AM335X_CONF_ENV)
 BAREBOX_AM335X_MAKE_OPT := $(BAREBOX_AM335X_CONF_OPT)
 
 BAREBOX_AM335X_IMAGES := images/barebox-am33xx-afi-gf.img \
 			images/barebox-am33xx-beaglebone.img
-BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_DIR)/,$(BAREBOX_AM335X_IMAGES))
+BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_BUILD_DIR)/,$(BAREBOX_AM335X_IMAGES))
 
 ifdef PTXCONF_BAREBOX_AM335X
 $(BAREBOX_AM335X_CONFIG):
@@ -61,10 +62,10 @@ endif
 
 $(STATEDIR)/barebox-am335x.prepare: $(BAREBOX_AM335X_CONFIG)
 	@$(call targetinfo)
-	@rm -f "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
-	@ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
-		"$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
 	@$(call world/prepare, BAREBOX_AM335X)
+	@rm -f "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
+	@ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
+		"$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -76,14 +77,14 @@ $(STATEDIR)/barebox-am335x.install:
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
 # ----------------------------------------------------------------------------
 
 $(STATEDIR)/barebox-am335x.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_AM335X_IMAGES), \
 		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image));)
+			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -94,7 +95,7 @@ $(STATEDIR)/barebox-am335x.clean:
 	@$(call targetinfo)
 	@$(call clean_pkg, BAREBOX_AM335X)
 	@$(foreach image, $(BAREBOX_AM335X_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x;)
+		rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x$(ptx/nl))
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

  parent reply	other threads:[~2019-10-29 11:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29 11:28 [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 01/14] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 02/14] v7a: barebox-common: add clean target that affects " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 03/14] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 04/14] barebox-vexpress: sync with latest barebox template Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 05/14] barebox-mx6: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 06/14] barebox-rpi2: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 07/14] barebox-am335x-mlo: " Michael Olbrich
2019-10-29 11:28 ` Michael Olbrich [this message]
2019-10-29 11:28 ` [DistroKit] [PATCH 09/14] barebox-common: " Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 10/14] barebox-vexpress: remove installed files Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 11/14] barebox-rpi2: don't add a suffix to the images Michael Olbrich
2019-10-29 11:28 ` [DistroKit] [PATCH 12/14] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 13/14] barebox-am335x: " Michael Olbrich
2019-10-29 11:29 ` [DistroKit] [PATCH 14/14] barebox-mx6: " Michael Olbrich
2019-10-29 15:42 ` [DistroKit] [PATCH 00/14] Barebox Update and Cleanup Robert Schwebel
2019-11-02  9:15   ` Robert Schwebel
2019-11-04 10:09     ` Roland Hieber
2019-11-04 13:18       ` Rouven Czerwinski
2019-11-04 21:16         ` Michael Olbrich

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=20191029112901.3380-9-m.olbrich@pengutronix.de \
    --to=m.olbrich@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