diff options
Diffstat (limited to 'external/meta-updater/recipes-connectivity')
4 files changed, 2 insertions, 30 deletions
diff --git a/external/meta-updater/recipes-connectivity/connman/connman_%.bbappend b/external/meta-updater/recipes-connectivity/connman/connman_%.bbappend index b3633cc9..cd1b95de 100644 --- a/external/meta-updater/recipes-connectivity/connman/connman_%.bbappend +++ b/external/meta-updater/recipes-connectivity/connman/connman_%.bbappend @@ -1 +1 @@ -RPROVIDES_${PN} += "virtual/network-configuration" +RPROVIDES_${PN} += "network-configuration" diff --git a/external/meta-updater/recipes-connectivity/connman/connman_1.35.bbappend b/external/meta-updater/recipes-connectivity/connman/connman_1.35.bbappend deleted file mode 100644 index 08ec8326..00000000 --- a/external/meta-updater/recipes-connectivity/connman/connman_1.35.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -RPROVIDES_${PN} += "virtual/network-configuration" - -# patch to not create the resolv.conf symlink at run-time, as it's already -# handled in the recipe and messes up with ostree -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch" diff --git a/external/meta-updater/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch b/external/meta-updater/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch deleted file mode 100644 index 9b4a78c9..00000000 --- a/external/meta-updater/recipes-connectivity/connman/files/0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9e724a61f015304c9d72d829a66178d20e3fa980 Mon Sep 17 00:00:00 2001 -From: Laurent Bonnans <laurent.bonnans@here.com> -Date: Wed, 31 Jul 2019 18:15:47 +0200 -Subject: [PATCH] tmpfiles script: do not create the resolv.conf symlink - -It's handled by yocto in our case - -Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com> ---- - scripts/connman_resolvconf.conf.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scripts/connman_resolvconf.conf.in b/scripts/connman_resolvconf.conf.in -index 2d61dfe1..8a7d3071 100644 ---- a/scripts/connman_resolvconf.conf.in -+++ b/scripts/connman_resolvconf.conf.in -@@ -1,2 +1 @@ - d @runstatedir@/connman - - - - --L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf --- -2.20.1 - diff --git a/external/meta-updater/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb b/external/meta-updater/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb index 40a39582..20a1a176 100644 --- a/external/meta-updater/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb +++ b/external/meta-updater/recipes-connectivity/networkd-dhcp-conf/networkd-dhcp-conf.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 inherit systemd -RPROVIDES_${PN} = "virtual/network-configuration" +RPROVIDES_${PN} = "network-configuration" SRC_URI = " \ file://20-wired-dhcp.network \ |