From ca53308f8803fb50709b3f17bb1f9e476366bb62 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 11 Apr 2022 18:44:44 -0400 Subject: meta-agl-core: update connman configuration override Upstream is now supplying a connman main.conf file in the connman-conf recipe, move installing our own modified version in our bbappend to just supplying our alternative file in a connman-conf bbappend. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: Ib89a24b29fd94093ead9ca6d13d9e60bb97b8a60 --- .../recipes-connectivity/connman/connman-conf.bbappend | 1 + .../recipes-connectivity/connman/connman-conf/main.conf | 3 +++ .../recipes-connectivity/connman/connman-conf_aglcore.inc | 2 ++ .../connman/0001-disable-when-booting-over-nfs.patch | 10 ++++++++++ .../recipes-connectivity/connman/connman_aglcore.inc | 13 ++----------- .../connman/files/0001-disable-when-booting-over-nfs.patch | 10 ---------- meta-agl-core/recipes-connectivity/connman/files/main.conf | 3 --- 7 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend create mode 100644 meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf create mode 100644 meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc create mode 100644 meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch delete mode 100644 meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch delete mode 100644 meta-agl-core/recipes-connectivity/connman/files/main.conf (limited to 'meta-agl-core') diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend new file mode 100644 index 000000000..bd6e7b75c --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'connman-conf_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf new file mode 100644 index 000000000..4dba25b70 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf/main.conf @@ -0,0 +1,3 @@ +[General] +FallbackTimeservers=pool.ntp.org +NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,meth diff --git a/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc new file mode 100644 index 000000000..4505ab779 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman-conf_aglcore.inc @@ -0,0 +1,2 @@ +# Pick up our version of main.conf +FILESEXTRAPATHS:prepend := "${THISDIR}/connman-conf:" diff --git a/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch new file mode 100644 index 000000000..f129a6580 --- /dev/null +++ b/meta-agl-core/recipes-connectivity/connman/connman/0001-disable-when-booting-over-nfs.patch @@ -0,0 +1,10 @@ +--- connman-1.36.orig/src/connman.service.in 2019-02-18 18:02:07.034947373 -0500 ++++ connman-1.36/src/connman.service.in 2019-02-18 18:07:24.689959219 -0500 +@@ -7,6 +7,7 @@ + Before=network.target multi-user.target shutdown.target + Wants=network.target + Conflicts=systemd-resolved.service ++ConditionKernelCommandLine=!root=/dev/nfs + + [Service] + Type=dbus diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc index 7299d18f3..e372e9186 100644 --- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc +++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc @@ -1,12 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/connman:" -SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \ - file://main.conf \ -" - -FILES:${PN} += "${sysconfdir}/connman/main.conf" - -do_install:append() { - install -d ${D}${sysconfdir}/connman - install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman -} +SRC_URI += "file://0001-disable-when-booting-over-nfs.patch" diff --git a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch deleted file mode 100644 index f129a6580..000000000 --- a/meta-agl-core/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- connman-1.36.orig/src/connman.service.in 2019-02-18 18:02:07.034947373 -0500 -+++ connman-1.36/src/connman.service.in 2019-02-18 18:07:24.689959219 -0500 -@@ -7,6 +7,7 @@ - Before=network.target multi-user.target shutdown.target - Wants=network.target - Conflicts=systemd-resolved.service -+ConditionKernelCommandLine=!root=/dev/nfs - - [Service] - Type=dbus diff --git a/meta-agl-core/recipes-connectivity/connman/files/main.conf b/meta-agl-core/recipes-connectivity/connman/files/main.conf deleted file mode 100644 index 4dba25b70..000000000 --- a/meta-agl-core/recipes-connectivity/connman/files/main.conf +++ /dev/null @@ -1,3 +0,0 @@ -[General] -FallbackTimeservers=pool.ntp.org -NetworkInterfaceBlacklist=vmnet,vboxnet,virbr,ifb,meth -- cgit 1.2.3-korg