From f02dda847da455c1f1e8323871b9c40d3c3c8c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 2 Sep 2014 08:07:49 +0000
Subject: strata/foundation.morph: Add libgcrypt, new systemd dependency

---
 strata/foundation.morph | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index a652fbd6..57238a6c 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -69,6 +69,15 @@ 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
@@ -79,6 +88,7 @@ chunks:
   - gobject-introspection
   - kmod
   - libcap2
+  - libgcrypt
   - pciutils
   - usbutils
 - name: lzo
-- 
cgit v1.2.1


From d18a9d4978f99f693dcfff48344248fae8a7824f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 3 Sep 2014 18:28:45 +0000
Subject: New version of kmod needed to compile systemd

---
 strata/foundation.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index 57238a6c..78daa4f8 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
-- 
cgit v1.2.1


From 39df1f608ab7bc13f7765022f079db5277674700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 7 Oct 2014 12:23:19 +0000
Subject: strata/genivi: Use fixed genivi components

---
 strata/genivi.morph | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/strata/genivi.morph b/strata/genivi.morph
index bd0a457d..24050b4c 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
-- 
cgit v1.2.1


From ea286f89fbc7eda7efc8245be0fcc45475ddd67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 1 Sep 2014 19:19:50 +0000
Subject: Build systemd v217

---
 strata/foundation.morph         | 4 ++--
 strata/foundation/systemd.morph | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index 78daa4f8..efe8fcd5 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -81,8 +81,8 @@ chunks:
 - 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
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 2a1933d7..b19ef261 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -6,7 +6,7 @@ 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
-- 
cgit v1.2.1


From 9a6814f867db08538daa44fa8d095176af2a9854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 10 Nov 2014 16:30:28 +0000
Subject: busybox.morph: Do not install custom systemd units for network/ntpd

This is automatically configured by systemd
---
 strata/build-essential/busybox.morph | 41 +-----------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index b0bb46f5..35f57357 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
-- 
cgit v1.2.1


From b076ed3ea80a947fc4c7b5fe023e03873e55990c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 10 Nov 2014 16:56:18 +0000
Subject: strata/build-essential.morph: update ref of busybox

To remove unneded systemd units
---
 strata/build-essential.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 38bd60d8..d7b86648 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
-- 
cgit v1.2.1


From 324b5f1a3295c54355f56ba58adef2c14cc34e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 10 Nov 2014 16:45:01 +0000
Subject: systemd.morph: Configure network using systemd

---
 strata/foundation/systemd.morph | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index b19ef261..1ee23cb8 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -13,9 +13,16 @@ install-commands:
 - 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
-- 
cgit v1.2.1


From 54f36e8b4a5a58d872980c13aba5bcc4726283f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Tue, 11 Nov 2014 10:35:47 +0000
Subject: system: simple-network is not needed anymore in systemd systems

---
 systems/base-system-armv7-highbank.morph                | 1 -
 systems/base-system-armv7-versatile.morph               | 1 -
 systems/base-system-armv7b-highbank.morph               | 1 -
 systems/base-system-armv7b-vexpress-tc2.morph           | 1 -
 systems/base-system-armv7lhf-highbank.morph             | 1 -
 systems/base-system-ppc64-generic.morph                 | 1 -
 systems/base-system-x86_32-generic.morph                | 1 -
 systems/base-system-x86_64-generic.morph                | 1 -
 systems/build-system-armv7lhf-highbank.morph            | 1 -
 systems/build-system-armv7lhf-jetson.morph              | 1 -
 systems/build-system-ppc64.morph                        | 1 -
 systems/build-system-x86_32-chroot.morph                | 1 -
 systems/build-system-x86_32.morph                       | 1 -
 systems/build-system-x86_64-chroot.morph                | 1 -
 systems/build-system-x86_64.morph                       | 1 -
 systems/ceph-service-x86_64-generic.morph               | 1 -
 systems/cxmanage-system-x86_64-generic.morph            | 1 -
 systems/devel-system-armv7-chroot.morph                 | 1 -
 systems/devel-system-armv7-highbank.morph               | 1 -
 systems/devel-system-armv7-versatile.morph              | 1 -
 systems/devel-system-armv7-wandboard.morph              | 1 -
 systems/devel-system-armv7b-chroot.morph                | 1 -
 systems/devel-system-armv7b-highbank.morph              | 1 -
 systems/devel-system-armv7lhf-chroot.morph              | 1 -
 systems/devel-system-armv7lhf-highbank.morph            | 1 -
 systems/devel-system-armv7lhf-jetson.morph              | 1 -
 systems/devel-system-armv7lhf-wandboard.morph           | 1 -
 systems/devel-system-ppc64-chroot.morph                 | 1 -
 systems/devel-system-ppc64-generic.morph                | 1 -
 systems/devel-system-x86_32-chroot.morph                | 1 -
 systems/devel-system-x86_32-generic.morph               | 1 -
 systems/devel-system-x86_64-chroot.morph                | 1 -
 systems/devel-system-x86_64-vagrant.morph               | 1 -
 systems/distbuild-system-x86_64-openstack.morph         | 1 -
 systems/genivi-baseline-system-armv7lhf-jetson.morph    | 1 -
 systems/genivi-baseline-system-armv7lhf-versatile.morph | 1 -
 systems/genivi-baseline-system-x86_64-generic.morph     | 1 -
 systems/gerrit-x86_64.morph                             | 1 -
 systems/gitlab-ci-runner.morph                          | 1 -
 systems/gitlab-server.morph                             | 1 -
 systems/nodejs-system-x86_64.morph                      | 1 -
 systems/qt4-devel-system-x86_64-generic.morph           | 1 -
 systems/qt5-devel-system-x86_64-generic.morph           | 1 -
 systems/trove-system-x86_64.morph                       | 1 -
 systems/web-system-x86_64-generic.morph                 | 1 -
 systems/xfce-system.morph                               | 1 -
 46 files changed, 46 deletions(-)

diff --git a/systems/base-system-armv7-highbank.morph b/systems/base-system-armv7-highbank.morph
index 4efd3981..47c69bad 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 2c3634b5..e5b9d7f5 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 2218af6f..169d490e 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 83b437a1..76d5c006 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 f5ced471..b889278d 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 85bc50b4..488bf5e4 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 f82d1667..40e62cad 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 1bcafc2a..a3346a44 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 43e701b5..e26c4003 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 674b5406..f557722b 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 a317c696..d1176135 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 776fa4ab..c77d7e3f 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 e336d2ec..697119c7 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 4cc66226..b24bd8f4 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 6db657a1..83a58ae1 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 182cf0cd..9c0cfb4e 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 4d731ea3..d75fbd14 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 265f63fa..348e6576 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 91716fc8..dac00e27 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 8e911703..ff5077bf 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 973f05ea..3599ddc3 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 c74e52b3..78cd4c5c 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 4f3944c2..4ba469be 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 4d106fba..314eb70d 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 7049b1b0..53277b89 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 0bf7da18..5d532882 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 7c27bcdf..bad1cdee 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 b74f164c..4a47e5dd 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 16bc7fc3..bd6a02d5 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 cf3d6ad1..626dc6f7 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 5afb6f72..6721a191 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 c2da5e1a..550e436c 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 85bbe90c..cefe96cb 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 483d8b99..aab6b08f 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 59cca3e8..5cbfddbe 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 ccc1419d..a5f07750 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 883c0efe..f5fb571e 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 0dbca14e..91d4c701 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 f7398793..9eabc403 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 a9c9bbd3..83093ac1 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 b34d6626..2692e2fc 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 0b4e4638..9a23bdeb 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 7171c0ca..6cb9377b 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 d603f531..b4f2c537 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 e916cffc..22aa88c0 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 1a2f8a97..152bf16b 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
-- 
cgit v1.2.1