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 v2 07/16] barebox-am335x-mlo: sync with latest barebox template
Date: Mon,  4 Nov 2019 22:21:38 +0100	[thread overview]
Message-ID: <20191104212147.22470-8-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de>

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 .../rules/barebox-am335x-mlo.make             | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 2056fc99b913..c668521a0d4c 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2017 by Sascha Hauer <s.hauer@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.
 #
@@ -18,34 +16,37 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
 #
 BAREBOX_AM335X_MLO_VERSION	:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
 BAREBOX_AM335X_MLO_MD5		:= $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_AM335X_MLO		:= barebox-$(BAREBOX_AM335X_MLO_VERSION)
+BAREBOX_AM335X_MLO		:= barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
 BAREBOX_AM335X_MLO_SUFFIX	:= tar.bz2
-BAREBOX_AM335X_MLO_DIR		:= $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
-BAREBOX_AM335X_MLO_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config)
-BAREBOX_AM335X_MLO_LICENSE	:= GPL-2.0
 BAREBOX_AM335X_MLO_URL		:= $(call barebox-url, BAREBOX_AM335X_MLO)
-BAREBOX_AM335X_MLO_SOURCE	:= $(SRCDIR)/$(BAREBOX_AM335X_MLO).$(BAREBOX_AM335X_MLO_SUFFIX)
+BAREBOX_AM335X_MLO_PATCHES	:= barebox-$(BAREBOX_AM335X_MLO_VERSION)
+BAREBOX_AM335X_MLO_SOURCE	:= $(SRCDIR)/$(BAREBOX_AM335X_MLO_PATCHES).$(BAREBOX_AM335X_MLO_SUFFIX)
+BAREBOX_AM335X_MLO_DIR		:= $(BUILDDIR)/$(BAREBOX_AM335X_MLO)
+BAREBOX_AM335X_MLO_BUILD_DIR	:= $(BAREBOX_AM335X_MLO_DIR)-build
+BAREBOX_AM335X_MLO_CONFIG	:= $(call ptx/in-platformconfigdir, barebox-am335x-mlo.config)
+BAREBOX_AM335X_MLO_LICENSE	:= GPL-2.0-only
+BAREBOX_AM335X_MLO_BUILD_OOT	:= KEEP
 
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
+# use host pkg-config for host tools
+BAREBOX_AM335X_MLO_PATH := PATH=$(HOST_PATH)
+
 BAREBOX_AM335X_MLO_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
+	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
-BAREBOX_AM335X_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_AM335X_MLO_CONF_OPT := $(call barebox-opts, BAREBOX_AM335X_MLO)
+BAREBOX_AM335X_MLO_CONF_OPT := \
+	-C $(BAREBOX_AM335X_MLO_DIR) \
+	O=$(BAREBOX_AM335X_MLO_BUILD_DIR) \
+	$(call barebox-opts, BAREBOX_AM335X_MLO)
 
-BAREBOX_AM335X_MLO_MAKE_ENV := $(BAREBOX_AM335X_MLO_CONF_ENV)
 BAREBOX_AM335X_MLO_MAKE_OPT := $(BAREBOX_AM335X_MLO_CONF_OPT)
 
 BAREBOX_AM335X_MLO_IMAGES := images/barebox-am33xx-afi-gf-mlo.img \
 			images/barebox-am33xx-beaglebone-mlo.img
-BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES))
+BAREBOX_AM335X_MLO_IMAGES := $(addprefix $(BAREBOX_AM335X_MLO_BUILD_DIR)/,$(BAREBOX_AM335X_MLO_IMAGES))
 
 ifdef PTXCONF_BAREBOX_AM335X_MLO
 $(BAREBOX_AM335X_MLO_CONFIG):
@@ -58,8 +59,6 @@ $(BAREBOX_AM335X_MLO_CONFIG):
 	@exit 1
 endif
 
-$(STATEDIR)/barebox-am335x-mlo.prepare: $(BAREBOX_AM335X_MLO_CONFIG)
-
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
@@ -69,14 +68,14 @@ $(STATEDIR)/barebox-am335x-mlo.install:
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
 # ----------------------------------------------------------------------------
 
 $(STATEDIR)/barebox-am335x-mlo.targetinstall:
 	@$(call targetinfo)
 	@$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \
 		install -m 644 \
-			$(image) $(IMAGEDIR)/$(notdir $(image));)
+			$(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -87,7 +86,7 @@ $(STATEDIR)/barebox-am335x-mlo.clean:
 	@$(call targetinfo)
 	@$(call clean_pkg, BAREBOX_AM335X_MLO)
 	@$(foreach image, $(BAREBOX_AM335X_MLO_IMAGES), \
-		rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo;)
+		rm -fv $(IMAGEDIR)/$(notdir $(image))-am335x-mlo$(ptx/nl))
 
 # ----------------------------------------------------------------------------
 # oldconfig / menuconfig
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

  parent reply	other threads:[~2019-11-04 21:21 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-04 21:21 [DistroKit] [PATCH v2 00/16] Barebox Update and Cleanup Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 01/16] v7a: barebox-common: modify oldconfig to affect all bareboxes Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 02/16] v7a: barebox-common: add clean target that affects " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 03/16] v7a: barebox: version bump 2019.08.1 → 2019.10.0 Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 04/16] barebox-vexpress: sync with latest barebox template Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 05/16] barebox-mx6: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 06/16] barebox-rpi2: " Michael Olbrich
2019-11-04 21:21 ` Michael Olbrich [this message]
2019-11-04 21:21 ` [DistroKit] [PATCH v2 08/16] barebox-am335x: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 09/16] barebox-common: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 10/16] barebox-vexpress: remove installed files Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 11/16] barebox-rpi2: don't add a suffix to the images Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 12/16] barebox-am335x-mlo: actually remove images during 'clean' Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 13/16] barebox-am335x: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 14/16] barebox-mx6: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 15/16] barebox: create the .ptxdist-defaultenv symlink in the build dir Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 16/16] platform-v7a: vexpress: use only one core for barebox Michael Olbrich
2019-11-04 22:10 ` [DistroKit] [PATCH v2 00/16] Barebox Update and Cleanup Robert Schwebel
2019-11-04 22:42   ` 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=20191104212147.22470-8-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