summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-03-21 12:36:42 +0000
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-03-21 12:36:42 +0000
commit24e2b51f2b81b6b48376a5b4facbcddb4caad177 (patch)
tree3fbebe6b77a30d35b5a8f67dd652e9b1556e3988
parent19f5819c58225e13cda8c239c318ff9bd779807d (diff)
downloaddefinitions-24e2b51f2b81b6b48376a5b4facbcddb4caad177.tar.gz
Renamed build-essential to gnu-toolchain
-rw-r--r--build-essential.bst20
-rw-r--r--build-essential/stage1.bst7
-rw-r--r--build-essential/stage2.bst22
-rw-r--r--gnu-toolchain.bst20
-rw-r--r--gnu-toolchain/binutils.bst (renamed from build-essential/binutils.bst)8
-rw-r--r--gnu-toolchain/busybox.bst (renamed from build-essential/busybox.bst)6
-rw-r--r--gnu-toolchain/ccache.bst (renamed from build-essential/ccache.bst)10
-rw-r--r--gnu-toolchain/fhs-dirs.bst (renamed from build-essential/fhs-dirs.bst)2
-rw-r--r--gnu-toolchain/gawk.bst (renamed from build-essential/gawk.bst)6
-rw-r--r--gnu-toolchain/gcc.bst (renamed from build-essential/gcc.bst)14
-rw-r--r--gnu-toolchain/glibc.bst (renamed from build-essential/glibc.bst)6
-rw-r--r--gnu-toolchain/gnome-platform.bst (renamed from build-essential/gnome-platform.bst)0
-rw-r--r--gnu-toolchain/gnome-sdk.bst (renamed from build-essential/gnome-sdk.bst)0
-rw-r--r--gnu-toolchain/linux-api-headers.bst (renamed from build-essential/linux-api-headers.bst)4
-rw-r--r--gnu-toolchain/m4-tarball.bst (renamed from build-essential/m4-tarball.bst)6
-rw-r--r--gnu-toolchain/make.bst (renamed from build-essential/make.bst)6
-rw-r--r--gnu-toolchain/stage1-binutils.bst (renamed from build-essential/stage1-binutils.bst)4
-rw-r--r--gnu-toolchain/stage1-gcc.bst (renamed from build-essential/stage1-gcc.bst)8
-rw-r--r--gnu-toolchain/stage1.bst7
-rw-r--r--gnu-toolchain/stage2-binutils.bst (renamed from build-essential/stage2-binutils.bst)8
-rw-r--r--gnu-toolchain/stage2-busybox.bst (renamed from build-essential/stage2-busybox.bst)8
-rw-r--r--gnu-toolchain/stage2-fake-bash.bst (renamed from build-essential/stage2-fake-bash.bst)4
-rw-r--r--gnu-toolchain/stage2-fhs-dirs.bst (renamed from build-essential/stage2-fhs-dirs.bst)2
-rw-r--r--gnu-toolchain/stage2-gawk.bst (renamed from build-essential/stage2-gawk.bst)8
-rw-r--r--gnu-toolchain/stage2-gcc-fixed-headers.bst (renamed from build-essential/stage2-gcc-fixed-headers.bst)8
-rw-r--r--gnu-toolchain/stage2-gcc.bst (renamed from build-essential/stage2-gcc.bst)12
-rw-r--r--gnu-toolchain/stage2-glibc.bst (renamed from build-essential/stage2-glibc.bst)6
-rw-r--r--gnu-toolchain/stage2-libstdcxx.bst (renamed from build-essential/stage2-libstdcxx.bst)8
-rw-r--r--gnu-toolchain/stage2-linux-api-headers.bst (renamed from build-essential/stage2-linux-api-headers.bst)2
-rw-r--r--gnu-toolchain/stage2-make.bst (renamed from build-essential/stage2-make.bst)8
-rw-r--r--gnu-toolchain/stage2-reset-specs.bst (renamed from build-essential/stage2-reset-specs.bst)8
-rw-r--r--gnu-toolchain/stage2.bst22
-rw-r--r--gnu-toolchain/zlib.bst (renamed from build-essential/zlib.bst)4
33 files changed, 132 insertions, 132 deletions
diff --git a/build-essential.bst b/build-essential.bst
deleted file mode 100644
index 9ad1ba23..00000000
--- a/build-essential.bst
+++ /dev/null
@@ -1,20 +0,0 @@
-kind: stack
-
-depends:
-- build-essential/fhs-dirs.bst
-- build-essential/binutils.bst
-- build-essential/busybox.bst
-- build-essential/ccache.bst
-- build-essential/gawk.bst
-- build-essential/gcc.bst
-- build-essential/glibc.bst
-- build-essential/linux-api-headers.bst
-- build-essential/m4-tarball.bst
-- build-essential/make.bst
-
-# Build essential is the base runtime, ldconfig
-# must be run on it.
-public:
- bst:
- integration-commands:
- - ldconfig
diff --git a/build-essential/stage1.bst b/build-essential/stage1.bst
deleted file mode 100644
index 7304572a..00000000
--- a/build-essential/stage1.bst
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: stack
-
-depends:
-- build-essential/gnome-platform.bst
-- build-essential/gnome-sdk.bst
-- build-essential/stage1-binutils.bst
-- build-essential/stage1-gcc.bst
diff --git a/build-essential/stage2.bst b/build-essential/stage2.bst
deleted file mode 100644
index bfbe3376..00000000
--- a/build-essential/stage2.bst
+++ /dev/null
@@ -1,22 +0,0 @@
-kind: stack
-
-depends:
-- build-essential/stage2-binutils.bst
-- build-essential/stage2-busybox.bst
-- build-essential/stage2-fhs-dirs.bst
-- build-essential/stage2-glibc.bst
-- build-essential/stage2-gawk.bst
-- build-essential/stage2-gcc.bst
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-make.bst
-- build-essential/stage2-fake-bash.bst
-- build-essential/stage2-reset-specs.bst
-
-# Stage 2 is a minimal base used to build the
-# base runtime, must ldconfig when building on stage2
-public:
- bst:
- integration-commands:
- - |
- # In this stage, it may be that ld.so.conf doesnt exist yet
- ldconfig || exit 0
diff --git a/gnu-toolchain.bst b/gnu-toolchain.bst
new file mode 100644
index 00000000..f38a05da
--- /dev/null
+++ b/gnu-toolchain.bst
@@ -0,0 +1,20 @@
+kind: stack
+
+depends:
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/binutils.bst
+- gnu-toolchain/busybox.bst
+- gnu-toolchain/ccache.bst
+- gnu-toolchain/gawk.bst
+- gnu-toolchain/gcc.bst
+- gnu-toolchain/glibc.bst
+- gnu-toolchain/linux-api-headers.bst
+- gnu-toolchain/m4-tarball.bst
+- gnu-toolchain/make.bst
+
+# Build essential is the base runtime, ldconfig
+# must be run on it.
+public:
+ bst:
+ integration-commands:
+ - ldconfig
diff --git a/build-essential/binutils.bst b/gnu-toolchain/binutils.bst
index a71a2e6b..5983c465 100644
--- a/build-essential/binutils.bst
+++ b/gnu-toolchain/binutils.bst
@@ -7,11 +7,11 @@ sources:
ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
-- build-essential/zlib.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
+- gnu-toolchain/zlib.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/busybox.bst b/gnu-toolchain/busybox.bst
index 5029ce72..be14fa51 100644
--- a/build-essential/busybox.bst
+++ b/gnu-toolchain/busybox.bst
@@ -7,10 +7,10 @@ sources:
ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/ccache.bst b/gnu-toolchain/ccache.bst
index 76111195..f66a37ca 100644
--- a/build-essential/ccache.bst
+++ b/gnu-toolchain/ccache.bst
@@ -3,15 +3,15 @@ kind: autotools
sources:
- kind: git
url: upstream:ccache
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: 567631456f0899cdf0c382f898d38aadc8901d32
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
-- build-essential/zlib.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
+- gnu-toolchain/zlib.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/fhs-dirs.bst b/gnu-toolchain/fhs-dirs.bst
index 197d6e96..df715755 100644
--- a/build-essential/fhs-dirs.bst
+++ b/gnu-toolchain/fhs-dirs.bst
@@ -7,7 +7,7 @@ sources:
ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
environment:
diff --git a/build-essential/gawk.bst b/gnu-toolchain/gawk.bst
index c6169d13..7a612bfd 100644
--- a/build-essential/gawk.bst
+++ b/gnu-toolchain/gawk.bst
@@ -7,10 +7,10 @@ sources:
ref: 925f9363c4b0a5bb9375298afcdcf404efb32587
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/gcc.bst b/gnu-toolchain/gcc.bst
index 7b1f1c4b..b7b17ae6 100644
--- a/build-essential/gcc.bst
+++ b/gnu-toolchain/gcc.bst
@@ -3,17 +3,17 @@ kind: manual
sources:
- kind: git
url: upstream:gcc-tarball
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/linux-api-headers.bst
-- build-essential/glibc.bst
-- build-essential/zlib.bst
-- build-essential/m4-tarball.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/linux-api-headers.bst
+- gnu-toolchain/glibc.bst
+- gnu-toolchain/zlib.bst
+- gnu-toolchain/m4-tarball.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/glibc.bst b/gnu-toolchain/glibc.bst
index b1baf608..8621074e 100644
--- a/build-essential/glibc.bst
+++ b/gnu-toolchain/glibc.bst
@@ -7,10 +7,10 @@ sources:
ref: b995d95a5943785be3ab862b2d3276f3b4a22481
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/linux-api-headers.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/linux-api-headers.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/gnome-platform.bst b/gnu-toolchain/gnome-platform.bst
index fd5efb6b..fd5efb6b 100644
--- a/build-essential/gnome-platform.bst
+++ b/gnu-toolchain/gnome-platform.bst
diff --git a/build-essential/gnome-sdk.bst b/gnu-toolchain/gnome-sdk.bst
index 6b0f158f..6b0f158f 100644
--- a/build-essential/gnome-sdk.bst
+++ b/gnu-toolchain/gnome-sdk.bst
diff --git a/build-essential/linux-api-headers.bst b/gnu-toolchain/linux-api-headers.bst
index f05a6546..0020d2ae 100644
--- a/build-essential/linux-api-headers.bst
+++ b/gnu-toolchain/linux-api-headers.bst
@@ -7,9 +7,9 @@ sources:
ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
+- gnu-toolchain/fhs-dirs.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/m4-tarball.bst b/gnu-toolchain/m4-tarball.bst
index 26d123ba..1019c57a 100644
--- a/build-essential/m4-tarball.bst
+++ b/gnu-toolchain/m4-tarball.bst
@@ -7,10 +7,10 @@ sources:
ref: 23c11479b3ad787adc7a651ee0c4347839e47723
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/make.bst b/gnu-toolchain/make.bst
index 9723a61f..731d1a9f 100644
--- a/build-essential/make.bst
+++ b/gnu-toolchain/make.bst
@@ -7,10 +7,10 @@ sources:
ref: 4978d7129e42340ab9efeb0cb9cae4ad0fa052d4
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/fhs-dirs.bst
-- build-essential/glibc.bst
+- gnu-toolchain/fhs-dirs.bst
+- gnu-toolchain/glibc.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin
diff --git a/build-essential/stage1-binutils.bst b/gnu-toolchain/stage1-binutils.bst
index 8c89c7ce..f22a4458 100644
--- a/build-essential/stage1-binutils.bst
+++ b/gnu-toolchain/stage1-binutils.bst
@@ -7,8 +7,8 @@ sources:
ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
depends:
-- build-essential/gnome-platform.bst
-- build-essential/gnome-sdk.bst
+- gnu-toolchain/gnome-platform.bst
+- gnu-toolchain/gnome-sdk.bst
variables:
prefix: /tools
diff --git a/build-essential/stage1-gcc.bst b/gnu-toolchain/stage1-gcc.bst
index 81c4d40a..f7244c00 100644
--- a/build-essential/stage1-gcc.bst
+++ b/gnu-toolchain/stage1-gcc.bst
@@ -3,13 +3,13 @@ kind: autotools
sources:
- kind: git
url: upstream:gcc-tarball
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
depends:
-- build-essential/gnome-platform.bst
-- build-essential/gnome-sdk.bst
-- build-essential/stage1-binutils.bst
+- gnu-toolchain/gnome-platform.bst
+- gnu-toolchain/gnome-sdk.bst
+- gnu-toolchain/stage1-binutils.bst
variables:
prefix: /tools
diff --git a/gnu-toolchain/stage1.bst b/gnu-toolchain/stage1.bst
new file mode 100644
index 00000000..8e5399a0
--- /dev/null
+++ b/gnu-toolchain/stage1.bst
@@ -0,0 +1,7 @@
+kind: stack
+
+depends:
+- gnu-toolchain/gnome-platform.bst
+- gnu-toolchain/gnome-sdk.bst
+- gnu-toolchain/stage1-binutils.bst
+- gnu-toolchain/stage1-gcc.bst
diff --git a/build-essential/stage2-binutils.bst b/gnu-toolchain/stage2-binutils.bst
index f1a5f6f0..e3ef2eaa 100644
--- a/build-essential/stage2-binutils.bst
+++ b/gnu-toolchain/stage2-binutils.bst
@@ -7,12 +7,12 @@ sources:
ref: 5500a97a2ad1735db5b35bc51cfb825c1f4c38df
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-busybox.bst b/gnu-toolchain/stage2-busybox.bst
index 0b82ed46..a1774abd 100644
--- a/build-essential/stage2-busybox.bst
+++ b/gnu-toolchain/stage2-busybox.bst
@@ -7,12 +7,12 @@ sources:
ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-fake-bash.bst b/gnu-toolchain/stage2-fake-bash.bst
index 2289fc8f..85e0dced 100644
--- a/build-essential/stage2-fake-bash.bst
+++ b/gnu-toolchain/stage2-fake-bash.bst
@@ -1,9 +1,9 @@
kind: manual
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
variables:
diff --git a/build-essential/stage2-fhs-dirs.bst b/gnu-toolchain/stage2-fhs-dirs.bst
index 9d07d9a2..37346231 100644
--- a/build-essential/stage2-fhs-dirs.bst
+++ b/gnu-toolchain/stage2-fhs-dirs.bst
@@ -7,7 +7,7 @@ sources:
ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
variables:
diff --git a/build-essential/stage2-gawk.bst b/gnu-toolchain/stage2-gawk.bst
index ca1936fb..1c15d53a 100644
--- a/build-essential/stage2-gawk.bst
+++ b/gnu-toolchain/stage2-gawk.bst
@@ -7,12 +7,12 @@ sources:
ref: 925f9363c4b0a5bb9375298afcdcf404efb32587
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-gcc-fixed-headers.bst b/gnu-toolchain/stage2-gcc-fixed-headers.bst
index a83fca25..f3ed0e1e 100644
--- a/build-essential/stage2-gcc-fixed-headers.bst
+++ b/gnu-toolchain/stage2-gcc-fixed-headers.bst
@@ -3,14 +3,14 @@ kind: manual
sources:
- kind: git
url: upstream:gcc-tarball
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-gcc.bst b/gnu-toolchain/stage2-gcc.bst
index 445fe6f7..18594d8f 100644
--- a/build-essential/stage2-gcc.bst
+++ b/gnu-toolchain/stage2-gcc.bst
@@ -3,16 +3,16 @@ kind: manual
sources:
- kind: git
url: upstream:gcc-tarball
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
-- build-essential/stage2-gcc-fixed-headers.bst
-- build-essential/stage2-libstdcxx.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
+- gnu-toolchain/stage2-gcc-fixed-headers.bst
+- gnu-toolchain/stage2-libstdcxx.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-glibc.bst b/gnu-toolchain/stage2-glibc.bst
index dcb11dee..1c3745e1 100644
--- a/build-essential/stage2-glibc.bst
+++ b/gnu-toolchain/stage2-glibc.bst
@@ -7,11 +7,11 @@ sources:
ref: b995d95a5943785be3ab862b2d3276f3b4a22481
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-libstdcxx.bst b/gnu-toolchain/stage2-libstdcxx.bst
index f8a75a23..db6f8a62 100644
--- a/build-essential/stage2-libstdcxx.bst
+++ b/gnu-toolchain/stage2-libstdcxx.bst
@@ -3,14 +3,14 @@ kind: manual
sources:
- kind: git
url: upstream:gcc-tarball
- track: baserock/build-essential
+ track: baserock/gnu-toolchain
ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-linux-api-headers.bst b/gnu-toolchain/stage2-linux-api-headers.bst
index d72106c0..e5869bf1 100644
--- a/build-essential/stage2-linux-api-headers.bst
+++ b/gnu-toolchain/stage2-linux-api-headers.bst
@@ -7,7 +7,7 @@ sources:
ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
variables:
diff --git a/build-essential/stage2-make.bst b/gnu-toolchain/stage2-make.bst
index 3549d626..9c804f1b 100644
--- a/build-essential/stage2-make.bst
+++ b/gnu-toolchain/stage2-make.bst
@@ -7,12 +7,12 @@ sources:
ref: 4978d7129e42340ab9efeb0cb9cae4ad0fa052d4
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/build-essential/stage2-reset-specs.bst b/gnu-toolchain/stage2-reset-specs.bst
index 5ea3d044..5910903e 100644
--- a/build-essential/stage2-reset-specs.bst
+++ b/gnu-toolchain/stage2-reset-specs.bst
@@ -1,12 +1,12 @@
kind: manual
depends:
-- filename: build-essential/stage1.bst
+- filename: gnu-toolchain/stage1.bst
type: build
-- filename: build-essential/stage2-fhs-dirs.bst
+- filename: gnu-toolchain/stage2-fhs-dirs.bst
type: runtime
-- build-essential/stage2-linux-api-headers.bst
-- build-essential/stage2-glibc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-glibc.bst
variables:
prefix: /tools
diff --git a/gnu-toolchain/stage2.bst b/gnu-toolchain/stage2.bst
new file mode 100644
index 00000000..ccabaf58
--- /dev/null
+++ b/gnu-toolchain/stage2.bst
@@ -0,0 +1,22 @@
+kind: stack
+
+depends:
+- gnu-toolchain/stage2-binutils.bst
+- gnu-toolchain/stage2-busybox.bst
+- gnu-toolchain/stage2-fhs-dirs.bst
+- gnu-toolchain/stage2-glibc.bst
+- gnu-toolchain/stage2-gawk.bst
+- gnu-toolchain/stage2-gcc.bst
+- gnu-toolchain/stage2-linux-api-headers.bst
+- gnu-toolchain/stage2-make.bst
+- gnu-toolchain/stage2-fake-bash.bst
+- gnu-toolchain/stage2-reset-specs.bst
+
+# Stage 2 is a minimal base used to build the
+# base runtime, must ldconfig when building on stage2
+public:
+ bst:
+ integration-commands:
+ - |
+ # In this stage, it may be that ld.so.conf doesnt exist yet
+ ldconfig || exit 0
diff --git a/build-essential/zlib.bst b/gnu-toolchain/zlib.bst
index f64eeb43..1dd353c5 100644
--- a/build-essential/zlib.bst
+++ b/gnu-toolchain/zlib.bst
@@ -7,9 +7,9 @@ sources:
ref: 50893291621658f355bc5b4d450a8d06a563053d
depends:
-- filename: build-essential/stage2.bst
+- filename: gnu-toolchain/stage2.bst
type: build
-- build-essential/glibc.bst
+- gnu-toolchain/glibc.bst
environment:
PATH: /usr/bin:/bin:/usr/sbin:/sbin:/tools/bin:/tools/sbin