From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH 3/6] platform-v7a: barebox-rpi2: add layer support
Date: Fri, 26 Oct 2018 13:52:12 +0200 [thread overview]
Message-ID: <20181026115215.20186-4-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20181026115215.20186-1-m.olbrich@pengutronix.de>
Remove all references to PTXDIST_PLATFORMCONFIGDIR to do this.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/barebox-rpi2.config | 2 +-
configs/platform-v7a/rules/barebox-rpi2.make | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 6e673bd81d26..74c52e9fb2c8 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -174,7 +174,7 @@ CONFIG_DEFAULT_ENVIRONMENT=y
CONFIG_DEFAULT_COMPRESSION_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/raspberry-pi/env ${PTXDIST_PLATFORMCONFIGDIR}/barebox-rpi2-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
CONFIG_BAREBOXENV_TARGET=y
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index ba1651140e1a..cf9fc00aa9ef 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -21,7 +21,7 @@ BAREBOX_RPI2_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
-BAREBOX_RPI2_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-rpi2.config
+BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config)
BAREBOX_RPI2_LICENSE := GPL-2.0
BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX)
@@ -58,6 +58,12 @@ $(BAREBOX_RPI2_CONFIG):
endif
$(STATEDIR)/barebox-rpi2.prepare: $(BAREBOX_RPI2_CONFIG)
+ @$(call targetinfo)
+ @rm -f "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ @ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
+ "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ @$(call world/prepare, BAREBOX_RPI2)
+ @$(call touch)
# ----------------------------------------------------------------------------
# Install
--
2.19.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2018-10-26 11:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-26 11:52 [DistroKit] [PATCH 0/6] platform-v7a: basic " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 1/6] platform-v7a: barebox-am335x: add " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 2/6] platform-v7a: barebox-mx6: " Michael Olbrich
2018-10-26 11:52 ` Michael Olbrich [this message]
2018-10-26 11:52 ` [DistroKit] [PATCH 4/6] platform-v7a: image-rpi2: " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 5/6] platform-v7a: barebox-vexpress: " Michael Olbrich
2018-10-26 11:52 ` [DistroKit] [PATCH 6/6] platform-v7a: barebox-am335x-mlo: " Michael Olbrich
2018-10-26 11:59 ` [DistroKit] [PATCH 0/6] platform-v7a: basic " 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=20181026115215.20186-4-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