summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-09-07 11:00:55 +0100
committerJavier Jardón <jjardon@gnome.org>2017-09-07 11:08:56 +0100
commit3f62b4cfef59bdbf52af78a581aa597897110956 (patch)
treeb80db681aafc64276208c3314d59fcd3fc99b7cb
parent36420bfabe032c81bff8c792516985f516a9db06 (diff)
downloaddefinitions-3f62b4cfef59bdbf52af78a581aa597897110956.tar.gz
TEST
-rw-r--r--strata/foundation.morph5
-rw-r--r--strata/foundation/systemd.morph31
2 files changed, 2 insertions, 34 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 50d1e63b..a14be13b 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -47,10 +47,9 @@ chunks:
build-depends:
- libgpg-error
- name: systemd
- morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: a1e2ef7ec912902d8142e7cb5830cbfb47dba86c
- unpetrify-ref: v232
+ ref: master
+ build-system: meson
build-depends:
- dbus-pre
- kmod
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
deleted file mode 100644
index d0f962a8..00000000
--- a/strata/foundation/systemd.morph
+++ /dev/null
@@ -1,31 +0,0 @@
-name: systemd
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
- --disable-manpages
- --disable-tests
- --libexecdir="$PREFIX/libexec"
- --enable-split-usr
-post-install-commands:
-- mkdir -p "$DESTDIR"/sbin
-- 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
-- touch "$DESTDIR/etc/machine-id"
-- |
- cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF"
- [Match]
- Name=e*
-
- [Network]
- DHCP=yes
- EOF
-# Use the pam config systemd provides
-- cp -a "$DESTDIR/$PREFIX"/share/factory/etc/pam.d/* "$DESTDIR/etc/pam.d"
-
-# Add pam_deny.so to the default systemd-auth pam.d config file. Without
-# it, if shadow is configured to use PAM, it would be possible to login
-# to a system with the wrong password.
-- echo 'auth requisite pam_deny.so' >> "$DESTDIR"/etc/pam.d/system-auth