From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Wed, 11 Mar 2020 18:42:07 +0000 (+0100)
Subject: Remove network config fragment deployed by upstream
X-Git-Tag: 9.99.1~94
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=919986e707f125da355e4b83c7d7635388e85a32;p=AGL%2Fmeta-agl.git

Remove network config fragment deployed by upstream

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
---

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
index 000000000..6661eab6c
--- /dev/null
+++ b/meta-agl-profile-core/recipes-core/systemd/systemd-conf_%.bbappend
@@ -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