summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-22 19:32:04 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-02-22 19:32:04 +0900
commit19f5819c58225e13cda8c239c318ff9bd779807d (patch)
tree791762e36709d41466d88d524170e8676be7a69f
parentf7a8deb3081672c22799f1ce4fca2d96c71f0caa (diff)
downloaddefinitions-19f5819c58225e13cda8c239c318ff9bd779807d.tar.gz
Upgrade build-essential to the baserock new usr merge approach.
This required making sure that fhs-dirs is depended on by anything which would stage on top of it, as the directory symlinks must come first. In this commit the dependencies are listed explicitly, probably there is a way to do this without being as wordy.
-rw-r--r--build-essential.bst2
-rw-r--r--build-essential/binutils.bst1
-rw-r--r--build-essential/busybox.bst1
-rw-r--r--build-essential/ccache.bst1
-rw-r--r--build-essential/gawk.bst1
-rw-r--r--build-essential/gcc.bst1
-rw-r--r--build-essential/glibc.bst1
-rw-r--r--build-essential/linux-api-headers.bst1
-rw-r--r--build-essential/m4-tarball.bst1
-rw-r--r--build-essential/make.bst1
-rw-r--r--build-essential/stage2-binutils.bst2
-rw-r--r--build-essential/stage2-busybox.bst2
-rw-r--r--build-essential/stage2-fake-bash.bst2
-rw-r--r--build-essential/stage2-gawk.bst2
-rw-r--r--build-essential/stage2-glibc.bst2
-rw-r--r--build-essential/stage2-make.bst2
-rw-r--r--build-essential/stage2-reset-specs.bst2
-rw-r--r--build-essential/stage2.bst4
18 files changed, 27 insertions, 2 deletions
diff --git a/build-essential.bst b/build-essential.bst
index 54a5d00b..9ad1ba23 100644
--- a/build-essential.bst
+++ b/build-essential.bst
@@ -1,10 +1,10 @@
kind: stack
depends:
+- build-essential/fhs-dirs.bst
- build-essential/binutils.bst
- build-essential/busybox.bst
- build-essential/ccache.bst
-- build-essential/fhs-dirs.bst
- build-essential/gawk.bst
- build-essential/gcc.bst
- build-essential/glibc.bst
diff --git a/build-essential/binutils.bst b/build-essential/binutils.bst
index 83b6d235..a71a2e6b 100644
--- a/build-essential/binutils.bst
+++ b/build-essential/binutils.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
- build-essential/zlib.bst
diff --git a/build-essential/busybox.bst b/build-essential/busybox.bst
index f2e9c667..5029ce72 100644
--- a/build-essential/busybox.bst
+++ b/build-essential/busybox.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
environment:
diff --git a/build-essential/ccache.bst b/build-essential/ccache.bst
index 085307e2..76111195 100644
--- a/build-essential/ccache.bst
+++ b/build-essential/ccache.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
- build-essential/zlib.bst
diff --git a/build-essential/gawk.bst b/build-essential/gawk.bst
index 57567900..c6169d13 100644
--- a/build-essential/gawk.bst
+++ b/build-essential/gawk.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
environment:
diff --git a/build-essential/gcc.bst b/build-essential/gcc.bst
index e835634e..7b1f1c4b 100644
--- a/build-essential/gcc.bst
+++ b/build-essential/gcc.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/linux-api-headers.bst
- build-essential/glibc.bst
- build-essential/zlib.bst
diff --git a/build-essential/glibc.bst b/build-essential/glibc.bst
index 1c10c678..b1baf608 100644
--- a/build-essential/glibc.bst
+++ b/build-essential/glibc.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/linux-api-headers.bst
environment:
diff --git a/build-essential/linux-api-headers.bst b/build-essential/linux-api-headers.bst
index 7a405a4f..f05a6546 100644
--- a/build-essential/linux-api-headers.bst
+++ b/build-essential/linux-api-headers.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/m4-tarball.bst b/build-essential/m4-tarball.bst
index ff69768b..26d123ba 100644
--- a/build-essential/m4-tarball.bst
+++ b/build-essential/m4-tarball.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
environment:
diff --git a/build-essential/make.bst b/build-essential/make.bst
index 9525487b..9723a61f 100644
--- a/build-essential/make.bst
+++ b/build-essential/make.bst
@@ -9,6 +9,7 @@ sources:
depends:
- filename: build-essential/stage2.bst
type: build
+- build-essential/fhs-dirs.bst
- build-essential/glibc.bst
environment:
diff --git a/build-essential/stage2-binutils.bst b/build-essential/stage2-binutils.bst
index a515d5dd..f1a5f6f0 100644
--- a/build-essential/stage2-binutils.bst
+++ b/build-essential/stage2-binutils.bst
@@ -9,6 +9,8 @@ sources:
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
- build-essential/stage2-glibc.bst
diff --git a/build-essential/stage2-busybox.bst b/build-essential/stage2-busybox.bst
index 12e770dd..0b82ed46 100644
--- a/build-essential/stage2-busybox.bst
+++ b/build-essential/stage2-busybox.bst
@@ -9,6 +9,8 @@ sources:
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
- build-essential/stage2-glibc.bst
diff --git a/build-essential/stage2-fake-bash.bst b/build-essential/stage2-fake-bash.bst
index 8bd5b15a..2289fc8f 100644
--- a/build-essential/stage2-fake-bash.bst
+++ b/build-essential/stage2-fake-bash.bst
@@ -3,6 +3,8 @@ kind: manual
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
variables:
prefix: /tools
diff --git a/build-essential/stage2-gawk.bst b/build-essential/stage2-gawk.bst
index ee901796..ca1936fb 100644
--- a/build-essential/stage2-gawk.bst
+++ b/build-essential/stage2-gawk.bst
@@ -9,6 +9,8 @@ sources:
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
- build-essential/stage2-glibc.bst
diff --git a/build-essential/stage2-glibc.bst b/build-essential/stage2-glibc.bst
index 0f0bace5..dcb11dee 100644
--- a/build-essential/stage2-glibc.bst
+++ b/build-essential/stage2-glibc.bst
@@ -9,6 +9,8 @@ sources:
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
variables:
diff --git a/build-essential/stage2-make.bst b/build-essential/stage2-make.bst
index 3b760c0d..3549d626 100644
--- a/build-essential/stage2-make.bst
+++ b/build-essential/stage2-make.bst
@@ -9,6 +9,8 @@ sources:
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
- build-essential/stage2-glibc.bst
diff --git a/build-essential/stage2-reset-specs.bst b/build-essential/stage2-reset-specs.bst
index 4b3b6f91..5ea3d044 100644
--- a/build-essential/stage2-reset-specs.bst
+++ b/build-essential/stage2-reset-specs.bst
@@ -3,6 +3,8 @@ kind: manual
depends:
- filename: build-essential/stage1.bst
type: build
+- filename: build-essential/stage2-fhs-dirs.bst
+ type: runtime
- build-essential/stage2-linux-api-headers.bst
- build-essential/stage2-glibc.bst
diff --git a/build-essential/stage2.bst b/build-essential/stage2.bst
index 2a337ec6..bfbe3376 100644
--- a/build-essential/stage2.bst
+++ b/build-essential/stage2.bst
@@ -17,4 +17,6 @@ depends:
public:
bst:
integration-commands:
- - ldconfig
+ - |
+ # In this stage, it may be that ld.so.conf doesnt exist yet
+ ldconfig || exit 0