summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2015-04-30 14:40:48 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-05-07 16:47:15 (GMT)
commit2df457330147cab89cd7ff3aeb7c2e0901c62a91 (patch)
tree05f0a8632391500b7ed6623c66eb91b8f794c1ae
parent594b3cc535d757141c9fe65ce36f2d5c77ddf12f (diff)
downloaddefinitions-2df457330147cab89cd7ff3aeb7c2e0901c62a91.tar.gz
Create /etc/ld.so.conf.d in the glibc chunks, not fhs-dirs as it is glibc specific
Include ld.so.conf and ld.so.conf.d in the glibc-libs artifact This fixes a problem with minimal systems introduced by this commit: c9afefed2d2278046ec5c0fb11c32220f3b7380d It meant that /etc/ld.so.conf was missing in minimal systems Change-Id: I4b63c33c4572e78092e1b434489787f3e788a80f
-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 ecd7c7c..f820547 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 9e5e745..f44d0eb 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