From 1fcb189349fbf38e145b803567ad1c555aa6edcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 20 Aug 2016 22:17:37 +0100 Subject: Remove ugly hacks Change-Id: I336e21d0d68cef7f053cd7c327d65d64c6a53416 --- strata/core/bash.morph | 1 - strata/core/shadow.morph | 4 +--- strata/core/util-linux.morph | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'strata/core') 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 -- cgit v1.2.1