summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-24 11:46:24 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-24 11:48:32 +0000
commitfe33d320ad0ee1c626cfa60a59759ac1662d89f9 (patch)
tree6503072f63c154f43a1fbf1ff23bd64e536ef63b
parenta2be876989a0d6f4d617dd9fd661d0eb26b5da2f (diff)
downloaddefinitions-fe33d320ad0ee1c626cfa60a59759ac1662d89f9.tar.gz
stage2-fhs-dirs: Usrmerge
-rw-r--r--strata/build-essential/stage2-fhs-dirs.morph5
1 files changed, 5 insertions, 0 deletions
diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph
index 14a6e253..1b4fdbe1 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.morph
@@ -4,6 +4,11 @@ description: create the FHS 2.3 directory hierarchy and the usual files
install-commands:
- sh ./create-fhs-dirs "$DESTDIR"
- rmdir "$DESTDIR/bin"
+- rmdir "$DESTDIR/sbin"
+- rm -r "$DESTDIR"/lib
+- ln -s usr/sbin "$DESTDIR"/sbin
+- ln -s usr/lib "$DESTDIR"/lib
+- ln -s usr/lib64 "$DESTDIR"/lib64
- ln -s "$PREFIX/bin" "$DESTDIR/bin"
- install -m 644 passwd "$DESTDIR/etc/passwd"
- install -m 600 shadow "$DESTDIR/etc/shadow"