From 7ae830f1bc4c355eaf76f99655160420edc520e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 21 Aug 2016 20:34:27 +0100 Subject: Implement /usr merge Do not create /bin, /sbin, /usr/sbin and /lib Create symlinks /bin -> /usr/bin /sbin -> /usr/bin /usr/sbin -> /usr/bin /lib -> /usr/lib More info here: https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/ --- strata/build-essential/stage2-fhs-dirs.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'strata/build-essential/stage2-fhs-dirs.morph') diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 64080217..6f842403 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -3,8 +3,8 @@ 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 "$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" -- cgit v1.2.1