From 0cbbccbc9df630f9694c464f640ed0b29e62e6ed Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 31 Oct 2014 00:46:21 +0000
Subject: Use glibc instead of eglibc

---
 strata/build-essential.morph | 82 ++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

(limited to 'strata/build-essential.morph')

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 35ceaed9..6cc85e8c 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
@@ -65,11 +65,11 @@ chunks:
   - stage1-gcc
   build-mode: bootstrap
   prefix: /tools
-- name: stage2-eglibc
-  morph: strata/build-essential/stage2-eglibc.morph
-  repo: upstream:eglibc2
-  ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
-  unpetrify-ref: baserock/2.15-build-essential
+- name: stage2-glibc
+  morph: strata/build-essential/stage2-glibc.morph
+  repo: upstream:glibc
+  ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+  unpetrify-ref: baserock/glibc-2.20
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -84,7 +84,7 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-gcc-fixed-headers
@@ -95,7 +95,7 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-gcc
@@ -106,7 +106,7 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-gcc-fixed-headers
   build-mode: bootstrap
   prefix: /tools
@@ -118,7 +118,7 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-fake-bash
@@ -146,7 +146,7 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-make
@@ -157,19 +157,19 @@ chunks:
   build-depends:
   - stage1-binutils
   - stage1-gcc
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: stage2-reset-specs
   morph: strata/build-essential/stage2-reset-specs.morph
-  repo: upstream:eglibc2
-  ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c
-  unpetrify-ref: baserock/2.15-build-essential
+  repo: upstream:glibc
+  ref: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+  unpetrify-ref: baserock/glibc-2.20
   build-depends:
   - stage1-binutils
   - stage1-gcc
   - stage2-linux-api-headers
-  - stage2-eglibc
+  - stage2-glibc
   build-mode: bootstrap
   prefix: /tools
 - name: fhs-dirs
@@ -180,7 +180,7 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
@@ -195,23 +195,23 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - 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: 52cf9a0153c14df4f6ae3bd0e1e6cc5d171e586c
+  unpetrify-ref: baserock/glibc-2.20
   build-depends:
   - stage2-binutils
   - stage2-busybox
   - stage2-fake-bash
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
@@ -220,9 +220,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
@@ -231,14 +231,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
   artifacts:
     zlib-libs: build-essential-minimal
 - name: binutils
@@ -249,14 +249,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
   - zlib
 - name: busybox
   morph: strata/build-essential/busybox.morph
@@ -266,14 +266,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
 - name: gawk
   morph: strata/build-essential/gawk.morph
   repo: upstream:gawk
@@ -282,14 +282,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
 - name: gcc
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
@@ -298,14 +298,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
   - zlib
   artifacts:
     gcc-libs: build-essential-minimal
@@ -317,14 +317,14 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
 - name: ccache
   morph: strata/build-essential/ccache.morph
   repo: upstream:ccache
@@ -333,12 +333,12 @@ chunks:
   build-depends:
   - stage2-binutils
   - stage2-busybox
-  - stage2-eglibc
+  - stage2-glibc
   - stage2-fhs-dirs
   - stage2-gawk
   - stage2-gcc
   - stage2-linux-api-headers
   - stage2-make
   - stage2-reset-specs
-  - eglibc
+  - glibc
   - zlib
-- 
cgit v1.2.1