summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-03-15 20:41:28 +0000
committerJavier Jardón <jjardon@gnome.org>2016-03-19 15:23:26 +0000
commit0a0da35e1a693fc909d1628f5e81cb3b2693c057 (patch)
tree173093e1cb423eeed7bb7d1f1e0749129367255d
parent0c13ce661c1c6d61a3d80fac9b8d24d44c61b8b8 (diff)
downloaddefinitions-0a0da35e1a693fc909d1628f5e81cb3b2693c057.tar.gz
strata/foundation/systemd.morph: simplify systemd cofiguration a bit
- xz is enabled by default - Use the default install directories, ie, /usr/lib and /usr/bin Change-Id: I038113fcbf0288703fbb06cc4b64b34d09d8fc72
-rw-r--r--strata/core/linux-pam.morph6
-rw-r--r--strata/foundation/systemd.morph17
2 files changed, 11 insertions, 12 deletions
diff --git a/strata/core/linux-pam.morph b/strata/core/linux-pam.morph
index e6cbf642..e65caa63 100644
--- a/strata/core/linux-pam.morph
+++ b/strata/core/linux-pam.morph
@@ -4,6 +4,6 @@ build-system: autotools
pre-configure-commands:
- autoreconf -ivf
configure-commands:
-# libdir has to be specified or it'll go into lib64. It has to be /lib because
-# systemd installs its pam library into /lib/security.
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="/lib"
+# libdir has to be specified or it'll go into lib64. It has to be /usr/lib because
+# systemd installs its pam library into /usr/lib/security.
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib"
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 0c733533..fb624259 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -2,20 +2,19 @@ name: systemd
kind: chunk
build-system: autotools
configure-commands:
-- sh autogen.sh
+- ./autogen.sh
# KILL added because it picks up /usr/bin/kill, which is not installed on
# all systems
-- |
- KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \
- --disable-tests --sysconfdir=/etc --localstatedir=/var \
- --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \
- --with-rootprefix= --with-rootlibdir=/lib
+- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+ --disable-manpages
+ --disable-tests
+ --libexecdir="$PREFIX/libexec"
post-install-commands:
- mkdir -p "$DESTDIR"/sbin
-- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init
-- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl
+- ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init
+- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/bin/systemctl
"$DESTDIR/sbin/$f"; done
-- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount"
+- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR$PREFIX/lib/systemd/system/tmp.mount"
>"$DESTDIR/etc/systemd/system/tmp.mount"
- touch "$DESTDIR/etc/machine-id"
- |