Remove ugly hacks

Change-Id: I336e21d0d68cef7f053cd7c327d65d64c6a53416

8 files changed, 16 insertions, 61 deletions

diff --git a/strata/core/bash.morph b/strata/core/bash.morph
index 5d0b8f03..59c9e8b4 100644
--- a/strata/core/bash.morph
+++ b/strata/core/bash.morph
@@ -5,7 +5,6 @@ configure-commands:
 - |
   export CFLAGS="${CFLAGS}  -DSYS_BASHRC='\"/etc/bash.bashrc\"'";
   ./configure --prefix="$PREFIX" \
-              --bindir=/bin \
               --without-bash-malloc \
               --with-installed-readline \
               --enable-readline
diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph
index cdb1ff75..5e3244ae 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.morph
@@ -4,13 +4,11 @@ build-system: autotools
 pre-configure-commands:
 - autoreconf -vfi
 configure-commands:
-# Installing to /bin so that they overwrite busybox login.
 - |
   ./configure  --with-selinux=no \
                --sysconfdir=/etc \
                --with-libpam=yes \
-               --prefix="$PREFIX" \
-               --bindir=/bin
+               --prefix="$PREFIX"
 post-install-commands:
 # Disable things handled by pam instead
 - |
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph
index a685af9c..dca8ad4c 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.morph
@@ -4,9 +4,7 @@ build-system: autotools
 pre-configure-commands:
 - ./autogen.sh
 configure-commands:
-# Installing to /bin so that they overwrite busybox login.
 - |
   ./configure --prefix="$PREFIX" \
               --enable-libmount-force-mountinfo \
-              --disable-use-tty-group \
-              --bindir=/bin
+              --disable-use-tty-group
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/
diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph
index c839c1b3..11ca9585 100644
--- a/strata/coreutils-common/tar.morph
+++ b/strata/coreutils-common/tar.morph
@@ -7,10 +7,7 @@ configure-commands:
 # Configure flag notes:
 # 1. Needed to run configure as root
 # 2. Disable some warning that cause the build to fail
-# 3. To use GNU tar instead the busybox one.
-#    This will dissappear when we merge /usr/bin and /bin
 - |
   `# [1]` env FORCE_UNSAFE_CONFIGURE=1          \
           ./configure --prefix="$PREFIX"        \
-  `# [2]` --disable-gcc-warnings                \
-  `# [3]` --bindir=/bin
+  `# [2]` --disable-gcc-warnings
diff --git a/strata/foundation/kmod.morph b/strata/foundation/kmod.morph
index 8f158e8e..fd24e8ca 100644
--- a/strata/foundation/kmod.morph
+++ b/strata/foundation/kmod.morph
@@ -14,36 +14,11 @@ build-commands:
 - make
 install-commands:
 - make DESTDIR="$DESTDIR" pkgconfigdir="$PREFIX"/lib/pkgconfig install
-
-# WARNING with the following command:
-# if the staging area when kmod is built is sufficiently different to the
-# staging area that kmod is included in, then these symlinks may not work.
-#
-# i.e. if /sbin isn't a symlink when this is built (fhs-dirs isn't included or
-# doesn't symlink /sbin to /usr/bin) then we get symlinks in /sbin which point
-# to ../usr/bin, but if /sbin is itself a symlink to /usr/bin, then the symlinks
-# would end up in /usr/bin, which would point to ../usr/bin, which would evaluate
-# to /usr/usr/bin.
-#
-# The alternatives to this are:
-#
-# 1. Use hardlinks instead, which has the problem of ssh-rsync upgrades duplicating
-#    the binary
-#
-# 2. Use an absolute path for the symlink, which makes things interesting when
-#    inspecting a chroot
-#
-# 3. Use a wrapper script to invoke kmod with a different name, which isn't
-#    possible in busybox ash without making a temporary directory, which means
-#    you need an extra process to hang around to clean that directory up.
-- |
-  if [ -h /sbin ]; then
-    for app in modprobe lsmod rmmod insmod modinfo depmod; do
-      ln -sf kmod "$DESTDIR$PREFIX/bin/$app"
-    done
-  else
-    install -d "$DESTDIR"/sbin
-    for app in modprobe lsmod rmmod insmod modinfo depmod; do
-      ln -sf ../"$PREFIX"/bin/kmod "$DESTDIR/sbin/$app"
-    done
-  fi
+post-install-commands:
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/insmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/modprobe
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/lsmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/rmmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/insmod
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/modinfo
+- ln -s kmod "$DESTDIR/$PREFIX"/bin/depmod
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index ae1f6a14..d0f962a8 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -3,13 +3,11 @@ kind: chunk
 build-system: autotools
 configure-commands:
 - ./autogen.sh
-# KILL added because it picks up /usr/bin/kill, which is not installed on
-# all systems
-- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
-                             --disable-manpages
-                             --disable-tests
-                             --libexecdir="$PREFIX/libexec"
-                             --enable-split-usr
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+              --disable-manpages
+              --disable-tests
+              --libexecdir="$PREFIX/libexec"
+              --enable-split-usr
 post-install-commands:
 - mkdir -p "$DESTDIR"/sbin
 - ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init