From c9afefed2d2278046ec5c0fb11c32220f3b7380d Mon Sep 17 00:00:00 2001 From: Richard Dale Date: Thu, 12 Mar 2015 10:20:01 +0000 Subject: Create /etc/ld.so.conf in glibc chunks, as it is glibc specific --- strata/build-essential/fhs-dirs.morph | 1 - strata/build-essential/glibc.morph | 8 ++++++++ strata/build-essential/stage2-fhs-dirs.morph | 1 - strata/build-essential/stage2-glibc.morph | 9 +++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..f4a1b1e9 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -7,7 +7,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index a4007bd4..e6f87fde 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -84,6 +84,14 @@ install-commands: netgroup: nis EOF - install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" # Compatibility symlink to work around the ABI break GLIBC introduced for # ARMv7 hard-float platforms in commit d3b36017d43. - case "$MORPH_ARCH" in diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 14a6e253..64080217 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -9,7 +9,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph index ffa0970b..48ceb767 100644 --- a/strata/build-essential/stage2-glibc.morph +++ b/strata/build-essential/stage2-glibc.morph @@ -32,6 +32,15 @@ build-commands: install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install +- mkdir -p "$DESTDIR/etc" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" - sh stage2-glibc-fix-specs # Install a symlink for the program interpreter (ld.so) so that binaries -- cgit v1.2.1