summaryrefslogtreecommitdiff
path: root/strata/build-essential.morph
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-10-19 19:02:03 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-10-19 19:02:03 +0000
commit09eee25d96508132a5607802887956a5dbe8d1a3 (patch)
tree1ead644c0ed3fb025a22cce5bd3f72bda2c56a9c /strata/build-essential.morph
parent6a4fd0cc18a6511876f8221076c58a0edf35ae2d (diff)
downloaddefinitions-09eee25d96508132a5607802887956a5dbe8d1a3.tar.gz
moar glibc
Diffstat (limited to 'strata/build-essential.morph')
-rw-r--r--strata/build-essential.morph31
1 files changed, 15 insertions, 16 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 23757b74..b10f3018 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -36,7 +36,7 @@ products:
include:
- fhs-dirs-.*
- busybox-.*
- - eglibc-nss
+ - glibc-nss
chunks:
- name: stage1-binutils
morph: strata/build-essential/stage1-binutils.morph
@@ -191,11 +191,10 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
-- name: eglibc
- morph: strata/build-essential/eglibc.morph
- repo: upstream:eglibc2
- ref: df0258044f321990eadd647e03095a48ad04c1a8
- unpetrify-ref: baserock/2.15-build-essential
+- name: glibc
+ morph: strata/build-essential/glibc.morph
+ repo: upstream:glibc
+ ref: baserock/pedroalvarez/build-essential
build-depends:
- stage2-binutils
- stage2-busybox
@@ -208,9 +207,9 @@ chunks:
- stage2-reset-specs
- linux-api-headers
artifacts:
- eglibc-gconv: build-essential-runtime
- eglibc-libs: build-essential-minimal
- eglibc-nss: build-essential-runtime
+ glibc-gconv: build-essential-runtime
+ glibc-libs: build-essential-minimal
+ glibc-nss: build-essential-runtime
- name: zlib
morph: strata/build-essential/zlib.morph
repo: upstream:zlib
@@ -226,7 +225,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
artifacts:
zlib-libs: build-essential-minimal
- name: binutils
@@ -244,7 +243,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- zlib
- name: busybox
morph: strata/build-essential/busybox.morph
@@ -260,7 +259,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- name: gawk
morph: strata/build-essential/gawk.morph
repo: upstream:gawk
@@ -276,7 +275,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- name: gcc
morph: strata/build-essential/gcc.morph
repo: upstream:gcc-tarball
@@ -292,7 +291,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- zlib
artifacts:
gcc-libs: build-essential-minimal
@@ -311,7 +310,7 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- name: ccache
morph: strata/build-essential/ccache.morph
repo: upstream:ccache
@@ -327,5 +326,5 @@ chunks:
- stage2-linux-api-headers
- stage2-make
- stage2-reset-specs
- - eglibc
+ - glibc
- zlib