summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2015-03-12 14:16:25 (GMT)
committerRichard Dale <richard.dale@codethink.co.uk>2015-03-12 14:16:25 (GMT)
commitd42785d06b3b6e3fe143b1a0ce7b4dae390d0dc5 (patch)
tree92d75b93d3786c5e8aacac73c1cff6c89d832c08
parentd39632c8dd01509ed7e1e7591ca8ef59c707c54f (diff)
parentc9afefed2d2278046ec5c0fb11c32220f3b7380d (diff)
downloaddefinitions-d42785d06b3b6e3fe143b1a0ce7b4dae390d0dc5.tar.gz
Merge branch 'baserock/rdale/fhs-remove-ld-so-conf'
Reviewed-By: javier.jardon@codethink.co.uk Reviewed-By: pedro.alvarez@codethink.co.uk
-rw-r--r--strata/build-essential/fhs-dirs.morph1
-rw-r--r--strata/build-essential/glibc.morph8
-rw-r--r--strata/build-essential/stage2-fhs-dirs.morph1
-rw-r--r--strata/build-essential/stage2-glibc.morph9
4 files changed, 17 insertions, 2 deletions
diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph
index 6447487..f4a1b1e 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 a4007bd..e6f87fd 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 <<EOF > 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 14a6e25..6408021 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 ffa0970..48ceb76 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 <<EOF > 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