diff mbox series

[06/39] resolvconf: update 1.87 -> 1.91

Message ID 20220119104117.2120127-6-alex@linutronix.de
State Accepted, archived
Commit a8accf2a042f8a8cbba350c6de20152efeddd747
Headers show
Series [01/39] mesa: fold mesa-gl variant into the main recipe using mcextend class | expand

Commit Message

Alexander Kanavin Jan. 19, 2022, 10:40 a.m. UTC 
Drop patch as issue resolved upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../resolvconf/fix-path-for-busybox.patch     | 20 -------------------
 ...{resolvconf_1.87.bb => resolvconf_1.91.bb} |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.87.bb => resolvconf_1.91.bb} (96%)
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch b/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
deleted file mode 100644
index 1aead07869..0000000000
--- a/meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-
-busybox installs readlink into /usr/bin, so ensure /usr/bin
-is in the path.
-
-Upstream-Status: Submitted
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: resolvconf-1.76/etc/resolvconf/update.d/libc
-===================================================================
---- resolvconf-1.76.orig/etc/resolvconf/update.d/libc
-+++ resolvconf-1.76/etc/resolvconf/update.d/libc
-@@ -16,7 +16,7 @@
- #
- 
- set -e
--PATH=/sbin:/bin
-+PATH=/sbin:/bin:/usr/bin
- 
- [ -x /lib/resolvconf/list-records ] || exit 1
- 
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb
similarity index 96%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb
index f57abe3619..cb25238eba 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb
@@ -12,11 +12,10 @@  HOMEPAGE = "http://packages.debian.org/resolvconf"
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \
-           file://fix-path-for-busybox.patch \
            file://99_resolvconf \
            "
 
-SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b"
+SRCREV = "859209d573e7aec0e95d812c6b52444591a628d1"
 
 S = "${WORKDIR}/git"