From 24d2d29c2987a923d90678404d8ed2d091b7ac6f Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Fri, 6 Jan 2012 11:59:02 +0000
Subject: make lib64 and usr/lib64 be symlinks to the lib dir

---
 create-fhs-dirs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/create-fhs-dirs b/create-fhs-dirs
index 53fb112..1b0eb28 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -85,6 +85,10 @@ do
     install -d -o "$owner" -g "$group" -m "$perms" "$target/$dirname"
 done
 
+# Add stupid lib64 symlinks.
+ln -s lib64 "$target/lib64"
+ln -s lib64 "$target/usr/lib64"
+
 # Fix permissions and ownerships for some special cases.
 chown "$owner:$group" "$target/."
 chmod "$perms" "$target/."
-- 
cgit v1.2.1


From 7287d7584a8f6b1e1e3464aa89bcb0b13ca35d88 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Fri, 6 Jan 2012 12:04:07 +0000
Subject: point to lib, not the symlink itself, meh

---
 create-fhs-dirs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/create-fhs-dirs b/create-fhs-dirs
index 1b0eb28..768cd73 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -86,8 +86,8 @@ do
 done
 
 # Add stupid lib64 symlinks.
-ln -s lib64 "$target/lib64"
-ln -s lib64 "$target/usr/lib64"
+ln -s lib "$target/lib64"
+ln -s lib "$target/usr/lib64"
 
 # Fix permissions and ownerships for some special cases.
 chown "$owner:$group" "$target/."
-- 
cgit v1.2.1


From 24114777bcae742e540d9a5a5a4d98d019f74a5d Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Wed, 11 Jan 2012 16:45:05 +0000
Subject: add a default /etc/ld.so.conf

Also, add /etc/ld.so.conf.d, and include *.conf from there.
---
 create-fhs-dirs | 1 +
 fhs-dirs.morph  | 1 +
 ld.so.conf      | 5 +++++
 3 files changed, 7 insertions(+)
 create mode 100644 ld.so.conf

diff --git a/create-fhs-dirs b/create-fhs-dirs
index 768cd73..34e20bf 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -36,6 +36,7 @@ bin
 boot
 dev
 etc
+etc/ld.so.conf.d
 home
 lib
 media
diff --git a/fhs-dirs.morph b/fhs-dirs.morph
index 99a9b87..61325c2 100644
--- a/fhs-dirs.morph
+++ b/fhs-dirs.morph
@@ -10,6 +10,7 @@
         "install group \"$DESTDIR/etc/group\"",
         "install -d \"$DESTDIR/etc/init.d\"",
         "install -m 744 rcS \"$DESTDIR/etc/init.d/rcS\"",
+        "install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"",
         "echo baserock > \"$DESTDIR\"/etc/hostname"
     ]
 }
diff --git a/ld.so.conf b/ld.so.conf
new file mode 100644
index 0000000..18cba60
--- /dev/null
+++ b/ld.so.conf
@@ -0,0 +1,5 @@
+/lib
+/usr/lib
+/usr/local/lib
+include /etc/ld.so.conf.d/*.conf
+
-- 
cgit v1.2.1