Remove network config fragment deployed by upstream 13/24213/1
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>
Wed, 11 Mar 2020 18:42:07 +0000 (19:42 +0100)
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>
Wed, 11 Mar 2020 18:42:07 +0000 (19:42 +0100)
Upstream YP/zeus unconditionally deploys a network config fragment for
systemd-networkd.
This breaks our CI builds as it races with connman and netboot.
At least it does disturb the network enough for netboot to fail.

We have a nicer solution for that in-tree that we will upstream.
Until then, we remove the config file from our filesystems.

Bug-AGL: SPEC-3233
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I9e8343e77af378c058702b13fe000a344e6a1ef9

meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend [new file with mode: 0644]

diff --git a/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend b/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend
new file mode 100644 (file)
index 0000000..6661eab
--- /dev/null
@@ -0,0 +1,4 @@
+do_install_append() {
+    # Remove ethernet script deployed by upstream unconditionally (SPEC-3221)
+    rm -rf ${D}${systemd_unitdir}/network/80-wired.network || true
+}
\ No newline at end of file