From dcc36f5804faefd2a593005c3dc1e73a6ceaa832 Mon Sep 17 00:00:00 2001
From: James Thomas <james.thomas@codethink.co.uk>
Date: Sat, 11 Oct 2014 00:38:03 +0000
Subject: Build against systemd with logind

---
 strata/NetworkManager-common.morph |  1 +
 strata/gnome.morph                 |  1 +
 strata/systemd-new.morph           | 20 ++++++++++++++++++++
 strata/systemd-new/systemd-2.morph | 19 +++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 strata/systemd-new.morph
 create mode 100644 strata/systemd-new/systemd-2.morph

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 7233d84f..a50e0e6c 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -4,6 +4,7 @@ build-depends:
 - morph: strata/audio-bluetooth.morph
 - morph: strata/network-security.morph
 - morph: strata/connectivity.morph
+- morph: strata/systemd-new.morph
 chunks:
 - name: libndp
   repo: upstream:libndp
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 2835cc37..9bb493ec 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -9,6 +9,7 @@ build-depends:
 - morph: strata/audio-bluetooth.morph
 - morph: strata/NetworkManager-common.morph
 - morph: strata/multimedia.morph
+- morph: strata/systemd-new.morph
 chunks:
 - name: dconf
   repo: upstream:dconf
diff --git a/strata/systemd-new.morph b/strata/systemd-new.morph
new file mode 100644
index 00000000..d3de5fd8
--- /dev/null
+++ b/strata/systemd-new.morph
@@ -0,0 +1,20 @@
+name: systemd-new
+kind: stratum
+description: wip
+build-depends:
+- morph: strata/foundation.morph
+chunks:
+- name: systemd-2
+  morph: strata/systemd-new/systemd-2.morph
+  repo: upstream:systemd
+  ref: 5d0ae62c665262c4c55536457e84e278c252cc0b
+  unpetrify-ref: v216
+  build-depends:
+  - dbus-pre
+  - coreutils
+  - gobject-introspection
+  - kmod
+  - libcap2
+  - libgcrypt
+  - pciutils
+  - usbutils
diff --git a/strata/systemd-new/systemd-2.morph b/strata/systemd-new/systemd-2.morph
new file mode 100644
index 00000000..f2ad6ef0
--- /dev/null
+++ b/strata/systemd-new/systemd-2.morph
@@ -0,0 +1,19 @@
+name: systemd-2
+kind: chunk
+max-jobs: 1
+build-system: autotools
+configure-commands:
+- sh autogen.sh
+- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware --disable-resolved --enable-logind
+install-commands:
+- make DESTDIR="$DESTDIR" install
+- 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
+  "$DESTDIR/sbin/$f"; done
+- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
+- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
+- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service"
+- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount"
+  >"$DESTDIR/etc/systemd/system/tmp.mount"
+- touch "$DESTDIR/etc/machine-id"
-- 
cgit v1.2.1