From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH v2 05/16] barebox-mx6: sync with latest barebox template
Date: Mon, 4 Nov 2019 22:21:36 +0100 [thread overview]
Message-ID: <20191104212147.22470-6-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/rules/barebox-mx6.make | 41 +++++++++++----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 69d823678c83..68f4bcb455f9 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.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,30 +16,33 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
BAREBOX_MX6_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
BAREBOX_MX6_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
-BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6 := barebox-mx6-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
-BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6)
+BAREBOX_MX6_PATCHES := barebox-$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6_PATCHES).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_DIR := $(BUILDDIR)/$(BAREBOX_MX6)
+BAREBOX_MX6_BUILD_DIR := $(BAREBOX_MX6_DIR)-build
BAREBOX_MX6_CONFIG := $(call ptx/in-platformconfigdir, barebox-mx6.config)
BAREBOX_MX6_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
-BAREBOX_MX6_LICENSE := GPL-2.0
-BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6)
-BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX)
+BAREBOX_MX6_LICENSE := GPL-2.0-only
+BAREBOX_MX6_BUILD_OOT := KEEP
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
+# use host pkg-config for host tools
+BAREBOX_MX6_PATH := PATH=$(HOST_PATH)
+
BAREBOX_MX6_WRAPPER_BLACKLIST := \
- TARGET_HARDEN_RELRO \
- TARGET_HARDEN_BINDNOW \
- TARGET_HARDEN_PIE \
- TARGET_DEBUG \
- TARGET_BUILD_ID
+ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-BAREBOX_MX6_CONF_ENV := KCONFIG_NOTIMESTAMP=1
-BAREBOX_MX6_CONF_OPT := $(call barebox-opts, BAREBOX_MX6)
+BAREBOX_MX6_CONF_OPT := \
+ -C $(BAREBOX_MX6_DIR) \
+ O=$(BAREBOX_MX6_BUILD_DIR) \
+ $(call barebox-opts, BAREBOX_MX6)
-BAREBOX_MX6_MAKE_ENV := $(BAREBOX_MX6_CONF_ENV)
BAREBOX_MX6_MAKE_OPT := $(BAREBOX_MX6_CONF_OPT)
BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
@@ -52,7 +53,7 @@ BAREBOX_MX6_IMAGES := images/barebox-embest-imx6s-riotboard.img \
images/barebox-boundarydevices-imx6qp-nitrogen6_max.img \
images/barebox-udoo-neo.img
-BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_DIR)/,$(BAREBOX_MX6_IMAGES))
+BAREBOX_MX6_IMAGES := $(addprefix $(BAREBOX_MX6_BUILD_DIR)/,$(BAREBOX_MX6_IMAGES))
ifdef PTXCONF_BAREBOX_MX6
$(BAREBOX_MX6_CONFIG):
@@ -67,10 +68,10 @@ endif
$(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG)
@$(call targetinfo)
+ @$(call world/prepare, BAREBOX_MX6)
@rm -f "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
@ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \
"$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
- @$(call world/prepare, BAREBOX_MX6)
@$(call touch)
# ----------------------------------------------------------------------------
@@ -82,14 +83,14 @@ $(STATEDIR)/barebox-mx6.install:
@$(call touch)
# ----------------------------------------------------------------------------
-# Targetinstall
+# Target-Install
# ----------------------------------------------------------------------------
$(STATEDIR)/barebox-mx6.targetinstall:
@$(call targetinfo)
@$(foreach image, $(BAREBOX_MX6_IMAGES), \
install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image));)
+ $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
@$(call touch)
# ----------------------------------------------------------------------------
@@ -100,7 +101,7 @@ $(STATEDIR)/barebox-mx6.clean:
@$(call targetinfo)
@$(call clean_pkg, BAREBOX_MX6)
@$(foreach image, $(BAREBOX_MX6_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6;)
+ rm -fv $(IMAGEDIR)/$(notdir $(image))-mx6$(ptx/nl))
# ----------------------------------------------------------------------------
# oldconfig / menuconfig
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev 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 ` Michael Olbrich [this message]
2019-11-04 21:21 ` [DistroKit] [PATCH v2 06/16] barebox-rpi2: " Michael Olbrich
2019-11-04 21:21 ` [DistroKit] [PATCH v2 07/16] barebox-am335x-mlo: " Michael Olbrich
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-6-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