moar glibc

2 files changed, 91 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
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
new file mode 100644
index 00000000..5372152a
--- /dev/null
+++ b/strata/build-essential/glibc.morph
@@ -0,0 +1,76 @@
+name: glibc
+kind: chunk
+products:
+- artifact: glibc-nss
+  include:
+  - etc/nsswitch.conf
+  - (usr/)?lib/libnss.*
+- artifact: glibc-gconv
+  include:
+  - (usr/)?lib/gconv/.*
+- artifact: glibc-libs
+  include:
+  - sbin/ldconfig
+  - lib(32|64)?/ld-.*
+  - (usr/)?lib(exec)?/pt_chown
+- artifact: glibc-bins
+  include:
+  - (usr/)?s?bin/.*
+  - (usr/)?libexec/getconf/.*
+  - (usr/)?lib/libSegFault\.so(\.\d+)*$
+- artifact: glibc-libs
+  include:
+  - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
+- artifact: glibc-devel
+  include:
+  - (usr/)?include/.*
+  - (usr/)?lib(32|64)?/lib.*\.a
+  - (usr/)?lib(32|64)?/lib.*\.la
+  - (usr/)?(lib(32|64)?|share)/pkgconfig/.*\.pc
+  - (usr/)?lib(32|64)?/.*\.o
+- artifact: glibc-locale
+  include:
+  - (usr/)?share/locale/.*
+  - (usr/)?share/i18n/.*
+  - (usr/)?share/zoneinfo/.*
+- artifact: glibc-misc
+  include:
+  - .*
+configure-commands:
+- mkdir o
+
+## Necessary for ARM port
+#- cd libc && ln -s ../ports ports
+
+- |
+  export CFLAGS="-O2 $CFLAGS"; cd o &&
+  ../configure \
+    --prefix="$PREFIX" \
+    --disable-profile \
+    --enable-kernel=2.6.25 \
+    --without-cvs \
+    --without-selinux
+
+build-commands:
+- cd o && make localtime=UTC
+
+install-commands:
+- cd o && make install_root="$DESTDIR" localtime=UTC install
+- mkdir -p "$DESTDIR/etc"
+- |
+  cat <<EOF > nsswitch.conf
+  passwd: compat
+  group: compat
+  shadow: compat
+
+  hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 myhostname
+  networks: files
+
+  protocols: db files
+  services: db files
+  ethers: db files
+  rpc: db files
+
+  netgroup: nis
+  EOF
+- install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf"