summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-11-04 22:21:46 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2019-11-04 23:08:22 +0100
commit9c8be7c5927589a14aeb25dbd93d596c7883f864 (patch)
tree5c55d1df58f625c97e143de3d4eee609bc9c0bf0
parent5e2a5016299cd91c9d89cf13910ef9940c871743 (diff)
downloadDistroKit-9c8be7c5927589a14aeb25dbd93d596c7883f864.tar.gz
barebox: create the .ptxdist-defaultenv symlink in the build dir
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>
-rw-r--r--configs/platform-v7a/barebox-am335x.config2
-rw-r--r--configs/platform-v7a/barebox-am335x.config.diff2
-rw-r--r--configs/platform-v7a/barebox-mx6.config2
-rw-r--r--configs/platform-v7a/barebox-mx6.config.diff2
-rw-r--r--configs/platform-v7a/barebox-rpi2.config2
-rw-r--r--configs/platform-v7a/barebox-rpi2.config.diff2
-rw-r--r--configs/platform-v7a/barebox-vexpress.config2
-rw-r--r--configs/platform-v7a/barebox-vexpress.config.diff2
-rw-r--r--configs/platform-v7a/barebox.config2
-rw-r--r--configs/platform-v7a/rules/barebox-am335x.make4
-rw-r--r--configs/platform-v7a/rules/barebox-mx6.make4
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make4
-rw-r--r--configs/platform-v7a/rules/barebox-vexpress.make4
13 files changed, 17 insertions, 17 deletions
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 6ba7c5c..7e1b92c 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 c2c0e9f..bfe683d 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 dad7170..4cfc051 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 bdfcf62..7c4d28c 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 a5caee8..3500cb1 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 6aa532a..c3b063a 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 388245d..203dd46 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 b49eb26..4e3c03e 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 b2e99c9..f66c4a9 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 503f3ca..a10474a 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 e8d2fdd..525ffd5 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 b0e6ef2..5f16584 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 8820da5..625ff79 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)
# ----------------------------------------------------------------------------