diff options
| author | Javier Jardón <jjardon@gnome.org> | 2016-08-21 20:34:50 +0100 |
|---|---|---|
| committer | Ana Huelamo <ana.huelamo@codethink.co.uk> | 2016-11-15 14:41:18 +0000 |
| commit | 4be570aa4b746907e8a2bab730ff70eada524edf (patch) | |
| tree | 59ecd36b6afe89d7ba7caaac620fff1bd546586f /strata/core | |
| parent | a9f3849a26f0fbcf2e0a1b7f97d21afe974f7d72 (diff) | |
| download | definitions-4be570aa4b746907e8a2bab730ff70eada524edf.tar.gz | |
Remove some hacks not needed anymore after the /usr merge
Change-Id: I459cb33978e644aa1ac2b3e71cb79ae67894c3e5
Diffstat (limited to 'strata/core')
| -rw-r--r-- | strata/core/attr.morph | 2 | ||||
| -rw-r--r-- | strata/core/bash.morph | 1 | ||||
| -rw-r--r-- | strata/core/shadow.morph | 4 | ||||
| -rw-r--r-- | strata/core/util-linux.morph | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/strata/core/attr.morph b/strata/core/attr.morph index d0bf6976..c7b46d31 100644 --- a/strata/core/attr.morph +++ b/strata/core/attr.morph @@ -7,7 +7,7 @@ configure-commands: - | ./configure --prefix="$PREFIX" \ --exec-prefix="$PREFIX" \ - --sbindir="$PREFIX"/sbin \ + --sbindir="$PREFIX"/bin \ --bindir="$PREFIX"/bin \ --libdir="$PREFIX"/lib \ --libexecdir="$PREFIX"/lib \ 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 |