From 0a0da35e1a693fc909d1628f5e81cb3b2693c057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 15 Mar 2016 20:41:28 +0000
Subject: 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
---
 strata/core/linux-pam.morph     |  6 +++---
 strata/foundation/systemd.morph | 17 ++++++++---------
 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"
 - |
-- 
cgit v1.2.1