From eedc4946164bc06086be60a529a28a164927720f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
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/

Change-Id: Ideee202f3063eb867eea40ca85336f6643951289
---
 strata/build-essential.morph                 | 8 ++++----
 strata/build-essential/stage2-fhs-dirs.morph | 4 ++--
 strata/coreutils-common/coreutils.morph      | 5 -----
 strata/coreutils-common/sed.morph            | 5 -----
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index c1b09172..280b4950 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -167,8 +167,8 @@ chunks:
 - name: stage2-fhs-dirs
   morph: strata/build-essential/stage2-fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
-  ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
-  unpetrify-ref: master
+  ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
+  unpetrify-ref: baserock/usr_merge
   build-mode: bootstrap
   prefix: /tools
 
@@ -214,8 +214,8 @@ chunks:
 - name: fhs-dirs
   morph: strata/build-essential/fhs-dirs.morph
   repo: baserock:baserock/fhs-dirs
-  ref: 1218cbd38a4f4e9da75af6f7fae946ca92666afb
-  unpetrify-ref: master
+  ref: 9fafca436000bb57ddd5c498f8a75ea7b274f6c5
+  unpetrify-ref: baserock/usr_merge
   build-depends:
   - stage2-binutils
   - stage2-busybox
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"
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index 3071cb9e..ad6b2c32 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/coreutils-common/coreutils.morph
@@ -10,8 +10,3 @@ build-commands:
 - make WERROR_CFLAGS=
 install-commands:
 - make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
-# This hack is for supporting "fdatasync" argument in "dd" command
-# which busybox "dd" does not support.
-# This hack should dissappear when we merge /usr/bin and /bin.
-- mkdir -p "$DESTDIR"/bin/
-- ln -sf ../usr/bin/dd "$DESTDIR"/bin/
diff --git a/strata/coreutils-common/sed.morph b/strata/coreutils-common/sed.morph
index 75b969de..87ace803 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/coreutils-common/sed.morph
@@ -6,8 +6,3 @@ pre-configure-commands:
 - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
 configure-commands:
 - ./configure --prefix="$PREFIX" --disable-gcc-warnings
-post-install-commands:
-# This hack is to use GNU sed instead the busybox one.
-# This will dissappear when we merge /usr/bin and /bin.
-- mkdir -p "$DESTDIR"/bin/
-- ln -sf ../usr/bin/sed "$DESTDIR"/bin/
-- 
cgit v1.2.1