diff options
-rw-r--r-- | strata/build-essential.morph | 16 | ||||
-rw-r--r-- | strata/build-essential/m4.morph (renamed from strata/core/m4.morph) | 0 | ||||
-rw-r--r-- | strata/core.morph | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index b9650bd8..02b2043a 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -309,6 +309,21 @@ chunks: - stage2-reset-specs - glibc +- name: m4 + morph: strata/build-essential/m4.morph + repo: upstream:m4 + ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db + unpetrify-ref: baserock/build-essential + build-depends: + - stage2-binutils + - stage2-busybox + - stage2-glibc + - stage2-fhs-dirs + - stage2-gcc + - stage2-make + - stage2-reset-specs + - glibc + - name: gcc morph: strata/build-essential/gcc.morph repo: upstream:gcc-tarball @@ -326,6 +341,7 @@ chunks: - stage2-reset-specs - glibc - zlib + - m4 artifacts: gcc-libs: build-essential-minimal diff --git a/strata/core/m4.morph b/strata/build-essential/m4.morph index b76afbe4..b76afbe4 100644 --- a/strata/core/m4.morph +++ b/strata/build-essential/m4.morph diff --git a/strata/core.morph b/strata/core.morph index f9db0399..87033546 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -28,12 +28,6 @@ chunks: ref: 3898e324f07c05404b63d71f0e519f352fb1e072 unpetrify-ref: baserock/build-essential build-depends: [] -- name: m4 - morph: strata/core/m4.morph - repo: upstream:m4 - ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db - unpetrify-ref: baserock/build-essential - build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils @@ -72,7 +66,6 @@ chunks: ref: cffdb90be331111ce3fbe4a32320181ec2b92652 unpetrify-ref: baserock/build-essential build-depends: - - m4 - perl - name: automake morph: strata/core/automake.morph @@ -94,8 +87,7 @@ chunks: repo: upstream:flex ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf unpetrify-ref: baserock/build-essential - build-depends: - - m4 + build-depends: [] - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new |