diff options
| -rw-r--r-- | build-essential.morph | 32 | ||||
| -rw-r--r-- | build-essential.morph.yaml | 38 |
2 files changed, 11 insertions, 59 deletions
diff --git a/build-essential.morph b/build-essential.morph index 3fa11a15..bd8859d4 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -45,18 +45,6 @@ ] }, { - "name": "stage2-zlib", - "repo": "upstream:zlib", - "ref": "baserock/build-essential", - "build-mode": "bootstrap", - "prefix": "/tools", - "build-depends": [ - "stage1-binutils", - "stage1-gcc", - "stage2-eglibc" - ] - }, - { "name": "stage2-binutils", "repo": "upstream:binutils-redhat", "ref": "baserock/build-essential", @@ -65,8 +53,7 @@ "build-depends": [ "stage1-binutils", "stage1-gcc", - "stage2-eglibc", - "stage2-zlib" + "stage2-eglibc" ] }, { @@ -78,8 +65,7 @@ "build-depends": [ "stage1-binutils", "stage1-gcc", - "stage2-eglibc", - "stage2-zlib" + "stage2-eglibc" ] }, { @@ -140,8 +126,7 @@ "stage2-gawk", "stage2-gcc", "stage2-linux-api-headers", - "stage2-make", - "stage2-zlib" + "stage2-make" ] }, { @@ -158,8 +143,7 @@ "stage2-gawk", "stage2-gcc", "stage2-linux-api-headers", - "stage2-make", - "stage2-zlib" + "stage2-make" ] }, { @@ -177,7 +161,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "linux-api-headers" ] }, @@ -196,7 +179,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc" ] }, @@ -215,7 +197,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc", "zlib" ] @@ -235,7 +216,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc" ] }, @@ -254,7 +234,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc" ] }, @@ -273,7 +252,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc", "zlib" ] @@ -293,7 +271,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc" ] }, @@ -312,7 +289,6 @@ "stage2-gcc", "stage2-linux-api-headers", "stage2-make", - "stage2-zlib", "eglibc", "zlib" ] diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml index f2bd1acf..f4708e3d 100644 --- a/build-essential.morph.yaml +++ b/build-essential.morph.yaml @@ -52,16 +52,6 @@ chunks: - stage1-gcc - stage2-linux-api-headers - - name: stage2-zlib - repo: upstream:zlib - ref: baserock/build-essential - build-mode: bootstrap - prefix: /tools - build-depends: - - stage1-binutils - - stage1-gcc - - stage2-eglibc - - name: stage2-binutils repo: upstream:binutils-redhat ref: baserock/build-essential @@ -71,7 +61,6 @@ chunks: - stage1-binutils - stage1-gcc - stage2-eglibc - - stage2-zlib - name: stage2-gcc repo: upstream:gcc-tarball @@ -82,7 +71,6 @@ chunks: - stage1-binutils - stage1-gcc - stage2-eglibc - - stage2-zlib - name: stage2-busybox repo: upstream:busybox @@ -126,16 +114,14 @@ chunks: # build is fully reproducible. # # We do a switch-a-roo between stage 2 and 3: stages 2 chunks are all built - # to run on a host *-bootstrap-* while stage 3 chunks are built are native - # built for a *-baserock-* machine. This works, because the cross build was - # all for show (and cleanliness) and the binaries actually still run on the - # the host. - # - # After build-essential is built we do another trick: stage2-fhs-dirs - # symlinks /bin to /tools/bin and /lib to /tools/lib, while the stage 3 - # chunks actually install things to those directories. FIXME: which breaks - # everything!!! This will have to change. + # to run on a host *-bootstrap-* while stage 3 chunks are native-built for + # a *-baserock-* machine. This works, because the cross build was all for + # show (and cleanliness) and the binaries actually still run on the host. # + # After build-essential is built we do another trick. See + # stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to + # /tools/bin during stage 2 but in stage 3 it becomes a real directory + # again. - name: fhs-dirs repo: baserock:baserock/fhs-dirs @@ -151,7 +137,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - name: linux-api-headers repo: upstream:linux @@ -167,7 +152,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - name: eglibc repo: upstream:eglibc2 @@ -183,7 +167,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - linux-api-headers - name: zlib @@ -200,7 +183,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - name: binutils @@ -217,7 +199,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - zlib @@ -235,7 +216,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - name: gawk @@ -252,7 +232,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - name: gcc @@ -269,7 +248,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - zlib @@ -287,7 +265,6 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc # Extras that need to be in build-essential but don't need bootstrapping. @@ -306,6 +283,5 @@ chunks: - stage2-gcc - stage2-linux-api-headers - stage2-make - - stage2-zlib - eglibc - zlib |