From: Michael Olbrich <m.olbrich@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [DistroKit] [PATCH v2 15/16] barebox: create the .ptxdist-defaultenv symlink in the build dir
Date: Mon, 4 Nov 2019 22:21:46 +0100 [thread overview]
Message-ID: <20191104212147.22470-16-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20191104212147.22470-1-m.olbrich@pengutronix.de>
This avoids problems if the same git tree is used in local_src/ for
multiple barebox packages.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
configs/platform-v7a/barebox-am335x.config | 2 +-
configs/platform-v7a/barebox-am335x.config.diff | 2 +-
configs/platform-v7a/barebox-mx6.config | 2 +-
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 2 +-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 2 +-
configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 2 +-
configs/platform-v7a/rules/barebox-am335x.make | 4 ++--
configs/platform-v7a/rules/barebox-mx6.make | 4 ++--
configs/platform-v7a/rules/barebox-rpi2.make | 4 ++--
configs/platform-v7a/rules/barebox-vexpress.make | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 6ba7c5cb36bf..7e1b92ccadef 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -201,7 +201,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=".ptxdist-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index c2c0e9f43dc9..bfe683dc3c82 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-f0f401a38f730b82ca95db270f8c2d48
+2c66986a487e0ff8d964d1f0c1230eed
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index dad7170503ac..4cfc051deb79 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -262,7 +262,7 @@ CONFIG_DEFAULT_COMPRESSION_NONE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_DFU=y
-CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index bdfcf62400d2..7c4d28c3118f 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-f0f401a38f730b82ca95db270f8c2d48
+2c66986a487e0ff8d964d1f0c1230eed
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index a5caee8eb73c..3500cb10d0cc 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -192,7 +192,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=".ptxdist-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 6aa532a4b838..c3b063ac627b 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-f0f401a38f730b82ca95db270f8c2d48
+2c66986a487e0ff8d964d1f0c1230eed
CONFIG_DRIVER_SERIAL_NS16550=y
# CONFIG_EEPROM_93XX46 is not set
CONFIG_MACH_RPI2=y
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 388245d8817c..203dd46cc8c1 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -179,7 +179,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=".ptxdist-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index b49eb265d7b6..4e3c03ef1fe5 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-f0f401a38f730b82ca95db270f8c2d48
+2c66986a487e0ff8d964d1f0c1230eed
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index b2e99c91151b..f66c4a950f85 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -192,7 +192,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=".ptxdist-defaultenv"
+CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
# CONFIG_BAREBOXENV_TARGET is not set
# CONFIG_BAREBOXCRC32_TARGET is not set
CONFIG_POLLER=y
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index 503f3ca9fe7d..a10474afe017 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -63,9 +63,9 @@ endif
$(STATEDIR)/barebox-am335x.prepare: $(BAREBOX_AM335X_CONFIG)
@$(call targetinfo)
@$(call world/prepare, BAREBOX_AM335X)
- @rm -f "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
+ @rm -f "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
@ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
- "$(BAREBOX_AM335X_DIR)/.ptxdist-defaultenv"
+ "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index e8d2fdd414aa..525ffd559c0e 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -69,9 +69,9 @@ endif
$(STATEDIR)/barebox-mx6.prepare: $(BAREBOX_MX6_CONFIG)
@$(call targetinfo)
@$(call world/prepare, BAREBOX_MX6)
- @rm -f "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
+ @rm -f "$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
@ln -s "$(call ptx/in-platformconfigdir, barebox-mx6-defaultenv)" \
- "$(BAREBOX_MX6_DIR)/.ptxdist-defaultenv"
+ "$(BAREBOX_MX6_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index b0e6ef2964ab..5f16584238d7 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -62,9 +62,9 @@ endif
$(STATEDIR)/barebox-rpi2.prepare: $(BAREBOX_RPI2_CONFIG)
@$(call targetinfo)
@$(call world/prepare, BAREBOX_RPI2)
- @rm -f "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ @rm -f "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
@ln -s "$(call ptx/in-platformconfigdir, barebox-rpi2-defaultenv)" \
- "$(BAREBOX_RPI2_DIR)/.ptxdist-defaultenv"
+ "$(BAREBOX_RPI2_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 8820da58707c..625ff79b472d 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -62,9 +62,9 @@ endif
$(STATEDIR)/barebox-vexpress.prepare: $(BAREBOX_VEXPRESS_CONFIG)
@$(call targetinfo)
@$(call world/prepare, BAREBOX_VEXPRESS)
- @rm -f "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
+ @rm -f "$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
@ln -s "$(call ptx/in-platformconfigdir, barebox-vexpress-defaultenv)" \
- "$(BAREBOX_VEXPRESS_DIR)/.ptxdist-defaultenv"
+ "$(BAREBOX_VEXPRESS_BUILD_DIR)/.ptxdist-defaultenv"
@$(call touch)
# ----------------------------------------------------------------------------
--
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 ` [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 ` [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 ` Michael Olbrich [this message]
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-16-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