summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-17 21:30:10 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-11-17 21:30:10 (GMT)
commit2b28b4d3aee6d9e21341132df241c1d7cb3c94e0 (patch)
treea78a798298254020e3dc6268fa53e9ed14f4e5c6
parent4b33e710f7da79a9b69bf636ab1329d9bcc9671e (diff)
parent54f36e8b4a5a58d872980c13aba5bcc4726283f9 (diff)
downloaddefinitions-2b28b4d3aee6d9e21341132df241c1d7cb3c94e0.tar.gz
Merge branch 'baserock/jjardon/systemd_217'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--strata/build-essential.morph2
-rw-r--r--strata/build-essential/busybox.morph41
-rw-r--r--strata/foundation.morph18
-rw-r--r--strata/foundation/systemd.morph13
-rw-r--r--strata/genivi.morph8
-rw-r--r--systems/base-system-armv7-highbank.morph1
-rw-r--r--systems/base-system-armv7-versatile.morph1
-rw-r--r--systems/base-system-armv7b-highbank.morph1
-rw-r--r--systems/base-system-armv7b-vexpress-tc2.morph1
-rw-r--r--systems/base-system-armv7lhf-highbank.morph1
-rw-r--r--systems/base-system-ppc64-generic.morph1
-rw-r--r--systems/base-system-x86_32-generic.morph1
-rw-r--r--systems/base-system-x86_64-generic.morph1
-rw-r--r--systems/build-system-armv7lhf-highbank.morph1
-rw-r--r--systems/build-system-armv7lhf-jetson.morph1
-rw-r--r--systems/build-system-ppc64.morph1
-rw-r--r--systems/build-system-x86_32-chroot.morph1
-rw-r--r--systems/build-system-x86_32.morph1
-rw-r--r--systems/build-system-x86_64-chroot.morph1
-rw-r--r--systems/build-system-x86_64.morph1
-rw-r--r--systems/ceph-service-x86_64-generic.morph1
-rw-r--r--systems/cxmanage-system-x86_64-generic.morph1
-rw-r--r--systems/devel-system-armv7-chroot.morph1
-rw-r--r--systems/devel-system-armv7-highbank.morph1
-rw-r--r--systems/devel-system-armv7-versatile.morph1
-rw-r--r--systems/devel-system-armv7-wandboard.morph1
-rw-r--r--systems/devel-system-armv7b-chroot.morph1
-rw-r--r--systems/devel-system-armv7b-highbank.morph1
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph1
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph1
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph1
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph1
-rw-r--r--systems/devel-system-ppc64-chroot.morph1
-rw-r--r--systems/devel-system-ppc64-generic.morph1
-rw-r--r--systems/devel-system-x86_32-chroot.morph1
-rw-r--r--systems/devel-system-x86_32-generic.morph1
-rw-r--r--systems/devel-system-x86_64-chroot.morph1
-rw-r--r--systems/devel-system-x86_64-vagrant.morph1
-rw-r--r--systems/distbuild-system-x86_64-openstack.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph1
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph1
-rw-r--r--systems/gerrit-x86_64.morph1
-rw-r--r--systems/gitlab-ci-runner.morph1
-rw-r--r--systems/gitlab-server.morph1
-rw-r--r--systems/nodejs-system-x86_64.morph1
-rw-r--r--systems/qt4-devel-system-x86_64-generic.morph1
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph1
-rw-r--r--systems/trove-system-x86_64.morph1
-rw-r--r--systems/web-system-x86_64-generic.morph1
-rw-r--r--systems/xfce-system.morph1
51 files changed, 30 insertions, 98 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 38bd60d..d7b8664 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -261,7 +261,7 @@ chunks:
- name: busybox
morph: strata/build-essential/busybox.morph
repo: upstream:busybox
- ref: 8a801e0f024f1385d8e989b80b90443546bceae7
+ ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c
unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index b0bb46f..35f5735 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -57,12 +57,6 @@ configure-commands:
build-commands:
- make
-- |
- for fin in systemd-units/*.in
- do
- f=$(echo "$fin" | sed 's/\.in$//')
- sed -e 's|@rootprefix@||g' "$fin" >"$f";
- done
install-commands:
- |
@@ -70,41 +64,8 @@ install-commands:
make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-- mkdir -p "$DESTDIR/var/spool/cron/crontabs"
-
-# Install systemd units
-- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- |
- for f in systemd-units/*.service; do
- install -m 644 "$f" "$DESTDIR/lib/systemd/system";
- done
-- |
- for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do
- ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/";
- done
-
-# Install custom udev rule to run ifup for every network device detected
-- mkdir -p "$DESTDIR/lib/udev/rules.d"
-- for f in udev-rules/100-baserock.rules; do
- install -m 644 "$f" "$DESTDIR/lib/udev/rules.d";
- done
-
-# Set up DHCP
-- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc
-- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script
-
-# Set up NTP
-- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/.
-- install -d "$DESTDIR/etc"
-- |
- cat << EOF > "$DESTDIR/etc/ntpd.conf"
- server 0.pool.ntp.org
- server 1.pool.ntp.org
- server 2.pool.ntp.org
- server 3.pool.ntp.org
- EOF
-
# Set up man environment variables
+- mkdir -p "$DESTDIR"/etc
- |
cat << EOF > "$DESTDIR/etc/profile"
# Set default pager to less
diff --git a/strata/foundation.morph b/strata/foundation.morph
index a652fbd..efe8fcd 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -19,8 +19,8 @@ chunks:
- name: kmod
morph: strata/foundation/kmod.morph
repo: upstream:kmod
- ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4
- unpetrify-ref: baserock/morph
+ ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566
+ unpetrify-ref: v18
build-depends: []
- name: libcap2
morph: strata/foundation/libcap2.morph
@@ -69,16 +69,26 @@ chunks:
unpetrify-ref: baserock/genivi/dbus-1.8.8
build-depends:
- glib
+- name: libgpg-error
+ repo: upstream:libgpg-error
+ ref: a498812d767c59ae2b75b0c985f5280b139e7dc4
+ build-depends: []
+- name: libgcrypt
+ repo: upstream:libgcrypt
+ ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
+ build-depends:
+ - libgpg-error
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: a77af3ec96015b2382ea31020d0a14b482d10a76
- unpetrify-ref: baserock/morph
+ ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88
+ unpetrify-ref: v217
build-depends:
- dbus-pre
- gobject-introspection
- kmod
- libcap2
+ - libgcrypt
- pciutils
- usbutils
- name: lzo
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 2a1933d..1ee23cb 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -6,16 +6,23 @@ 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
+ --with-rootlibdir=/lib
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"
+post-install-commands:
+- |
+ cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF"
+ [Match]
+ Name=en*
+
+ [Network]
+ DHCP=yes
+ EOF
diff --git a/strata/genivi.morph b/strata/genivi.morph
index bd0a457..24050b4 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -18,8 +18,8 @@ chunks:
- name: node-startup-controller
morph: strata/genivi/node-startup-controller.morph
repo: upstream:node-startup-controller
- ref: c78fddaddc24a2c49f5ef18896c93403575295ae
- unpetrify-ref: baserock/morph
+ ref: b77fb1dbb280ec45525853e52a362eafd736b400
+ unpetrify-ref: baserock/systemd_v216
build-depends:
- DLT-daemon
- name: googletest
@@ -71,8 +71,8 @@ chunks:
- itzam-tarball
- name: node-state-manager
repo: upstream:node-state-manager
- ref: dd4a86b9459537d2e85489b36abf80f34d12f098
- unpetrify-ref: baserock/genivi/baseline
+ ref: 30add4659e002f1df205cc36f71ef3141c10c1fb
+ unpetrify-ref: baserock/systemd_v216
build-depends:
- DLT-daemon
- persistence-client-library
diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
index 4efd398..47c69ba 100644
--- a/systems/base-system-armv7-highbank.morph
+++ b/systems/base-system-armv7-highbank.morph
@@ -15,6 +15,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-armv7-versatile.morph b/systems/base-system-armv7-versatile.morph
index 2c3634b..e5b9d7f 100644
--- a/systems/base-system-armv7-versatile.morph
+++ b/systems/base-system-armv7-versatile.morph
@@ -15,6 +15,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-armv7b-highbank.morph b/systems/base-system-armv7b-highbank.morph
index 2218af6..169d490 100644
--- a/systems/base-system-armv7b-highbank.morph
+++ b/systems/base-system-armv7b-highbank.morph
@@ -15,6 +15,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-armv7b-vexpress-tc2.morph b/systems/base-system-armv7b-vexpress-tc2.morph
index 83b437a..76d5c00 100644
--- a/systems/base-system-armv7b-vexpress-tc2.morph
+++ b/systems/base-system-armv7b-vexpress-tc2.morph
@@ -14,6 +14,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-armv7lhf-highbank.morph b/systems/base-system-armv7lhf-highbank.morph
index f5ced47..b889278 100644
--- a/systems/base-system-armv7lhf-highbank.morph
+++ b/systems/base-system-armv7lhf-highbank.morph
@@ -15,6 +15,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-ppc64-generic.morph b/systems/base-system-ppc64-generic.morph
index 85bc50b..488bf5e 100644
--- a/systems/base-system-ppc64-generic.morph
+++ b/systems/base-system-ppc64-generic.morph
@@ -15,6 +15,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/base-system-x86_32-generic.morph b/systems/base-system-x86_32-generic.morph
index f82d166..40e62ca 100644
--- a/systems/base-system-x86_32-generic.morph
+++ b/systems/base-system-x86_32-generic.morph
@@ -16,7 +16,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- cloud-init
diff --git a/systems/base-system-x86_64-generic.morph b/systems/base-system-x86_64-generic.morph
index 1bcafc2..a3346a4 100644
--- a/systems/base-system-x86_64-generic.morph
+++ b/systems/base-system-x86_64-generic.morph
@@ -17,7 +17,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- cloud-init
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index 43e701b..e26c400 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -24,7 +24,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 674b540..f557722 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -24,7 +24,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index a317c69..d117613 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -24,7 +24,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 776fa4a..c77d7e3 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -22,7 +22,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index e336d2e..697119c 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -24,7 +24,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 4cc6622..b24bd8f 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -22,7 +22,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 6db657a..83a58ae 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -24,7 +24,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph
index 182cf0c..9c0cfb4 100644
--- a/systems/ceph-service-x86_64-generic.morph
+++ b/systems/ceph-service-x86_64-generic.morph
@@ -19,7 +19,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- ceph
diff --git a/systems/cxmanage-system-x86_64-generic.morph b/systems/cxmanage-system-x86_64-generic.morph
index 4d731ea..d75fbd1 100644
--- a/systems/cxmanage-system-x86_64-generic.morph
+++ b/systems/cxmanage-system-x86_64-generic.morph
@@ -18,7 +18,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- fstab
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 265f63f..348e657 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -26,6 +26,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index 91716fc..dac00e2 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -29,6 +29,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 8e91170..ff5077b 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -29,6 +29,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index 973f05e..3599ddc 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -29,6 +29,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index c74e52b..78cd4c5 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -22,6 +22,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index 4f3944c..4ba469b 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -25,6 +25,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index 4d106fb..314eb70 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -26,6 +26,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 7049b1b..53277b8 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -30,6 +30,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 0bf7da1..5d53288 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -30,6 +30,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index 7c27bcd..bad1cde 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -30,6 +30,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index b74f164..4a47e5d 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -24,6 +24,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 16bc7fc..bd6a02d 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -27,6 +27,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index cf3d6ad..626dc6f 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -28,6 +28,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 5afb6f7..6721a19 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -31,7 +31,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- cloud-init
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index c2da5e1..550e436 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -28,6 +28,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index 85bbe90..cefe96c 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -29,7 +29,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- vagrant
diff --git a/systems/distbuild-system-x86_64-openstack.morph b/systems/distbuild-system-x86_64-openstack.morph
index 483d8b9..aab6b08 100644
--- a/systems/distbuild-system-x86_64-openstack.morph
+++ b/systems/distbuild-system-x86_64-openstack.morph
@@ -26,7 +26,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- distbuild
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 59cca3e..5cbfddb 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -36,7 +36,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- strip-gplv3
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index ccc1419..a5f0775 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -34,7 +34,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- strip-gplv3
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 883c0ef..f5fb571 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -38,7 +38,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- strip-gplv3
diff --git a/systems/gerrit-x86_64.morph b/systems/gerrit-x86_64.morph
index 0dbca14..91d4c70 100644
--- a/systems/gerrit-x86_64.morph
+++ b/systems/gerrit-x86_64.morph
@@ -26,7 +26,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- cloud-init
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index f739879..9eabc40 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -44,6 +44,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/gitlab-server.morph b/systems/gitlab-server.morph
index a9c9bbd..83093ac 100644
--- a/systems/gitlab-server.morph
+++ b/systems/gitlab-server.morph
@@ -28,7 +28,6 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
- gitlab
diff --git a/systems/nodejs-system-x86_64.morph b/systems/nodejs-system-x86_64.morph
index b34d662..2692e2f 100644
--- a/systems/nodejs-system-x86_64.morph
+++ b/systems/nodejs-system-x86_64.morph
@@ -17,6 +17,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 0b4e463..9a23bde 100644
--- a/systems/qt4-devel-system-x86_64-generic.morph
+++ b/systems/qt4-devel-system-x86_64-generic.morph
@@ -37,6 +37,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 7171c0c..6cb9377 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -37,6 +37,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph
index d603f53..b4f2c53 100644
--- a/systems/trove-system-x86_64.morph
+++ b/systems/trove-system-x86_64.morph
@@ -32,6 +32,5 @@ configuration-extensions:
- trove
- nfsboot-server
- fstab
-- simple-network
- install-files
- cloud-init
diff --git a/systems/web-system-x86_64-generic.morph b/systems/web-system-x86_64-generic.morph
index e916cff..22aa88c 100644
--- a/systems/web-system-x86_64-generic.morph
+++ b/systems/web-system-x86_64-generic.morph
@@ -32,6 +32,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 1a2f8a9..152bf16 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -36,6 +36,5 @@ strata:
configuration-extensions:
- set-hostname
- add-config-files
-- simple-network
- nfsboot
- install-files