From 036e1cbaf1183e3c3b38a776cbf3f3052a99b0fb Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 12 Feb 2015 23:27:30 +0000 Subject: Add symlinks to /usr from / --- strata/build-essential/fhs-dirs.morph | 5 +++++ strata/build-essential/stage2-fhs-dirs.morph | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..bf403cd4 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -11,6 +11,11 @@ install-commands: - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" +- rm -r "$DESTDIR"/lib +- ln -s /usr/bin "$DESTDIR"/bin +- ln -s /usr/sbin "$DESTDIR"/sbin +- ln -s /usr/lib "$DESTDIR"/lib +- ln -s /usr/lib64 "$DESTDIR"/lib64 - echo baserock > "$DESTDIR"/etc/hostname devices: - type: c diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 14a6e253..f917787b 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -3,8 +3,9 @@ kind: chunk description: create the FHS 2.3 directory hierarchy and the usual files install-commands: - sh ./create-fhs-dirs "$DESTDIR" -- rmdir "$DESTDIR/bin" -- ln -s "$PREFIX/bin" "$DESTDIR/bin" +- rmdir "$DESTDIR/usr/bin" +- ln -s /usr/bin "$DESTDIR"/bin +- ln -s "$PREFIX/bin" "$DESTDIR/usr/bin" - install -m 644 passwd "$DESTDIR/etc/passwd" - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" @@ -14,6 +15,10 @@ install-commands: - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" - echo baserock > "$DESTDIR"/etc/hostname +- rm -r "$DESTDIR"/lib +- ln -s /usr/sbin "$DESTDIR"/sbin +- ln -s /usr/lib "$DESTDIR"/lib +- ln -s /usr/lib64 "$DESTDIR"/lib64 devices: - type: c filename: /dev/console -- cgit v1.2.1