summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/build-essential/glibc.morph4
-rw-r--r--strata/build-essential/stage2-glibc.morph1
2 files changed, 5 insertions, 0 deletions
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index ecd7c7c4..f820547d 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -20,7 +20,10 @@ products:
- (usr/)?lib/libSegFault\.so(\.\d+)*$
- artifact: glibc-libs
include:
+ # This is processed after bins, so bins can take libSegFault.so
- (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
+ - etc/ld.so.conf
+ - etc/ld.so.conf.d
- artifact: glibc-devel
include:
- (usr/)?include/.*
@@ -67,6 +70,7 @@ build-commands:
install-commands:
- cd o && make install_root="$DESTDIR" localtime=UTC install
- mkdir -p "$DESTDIR/etc"
+- mkdir -p "$DESTDIR/etc/ld.so.conf.d"
- |
cat <<EOF > nsswitch.conf
passwd: compat
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index 9e5e745b..f44d0ebb 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -33,6 +33,7 @@ build-commands:
install-commands:
- cd o && make install_root="$DESTDIR" localtime=UTC install
- mkdir -p "$DESTDIR/etc"
+- mkdir -p "$DESTDIR/etc/ld.so.conf.d"
- |
cat <<EOF > ld.so.conf
/lib