diff mbox series

resolvconf: upgrade 1.87 -> 1.90

Message ID 1641192826-41876-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series resolvconf: upgrade 1.87 -> 1.90 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 3, 2022, 6:53 a.m. UTC 
Remove fix-path-for-busybox.patch
since it is included in 1.90

Changelog:
=========
 * Add basic support for ifupdown2 multiple address families
    (Closes: #993270).
  * Move the normalisation script into a separate file.
  * Add a build-time test to verify interface order list is correct.
  * Synchronise the interface order lists.
  * Make the usage notice more useful.
  * Embed the version number during the package build process.
  * Add --version command.
  * Add --help/-h.
  * Remove a pointless use of which(1), since we know where ifquery lives.
  * Update copyright years.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../resolvconf/fix-path-for-busybox.patch     | 20 -------------------
 ...{resolvconf_1.87.bb => resolvconf_1.90.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.90.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.90.bb
similarity index 96%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.90.bb
index f57abe3619..54d114d7b6 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.90.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 = "0a06ef77f4022f8cea2edb7c3013af5a7ddc983d"
 
 S = "${WORKDIR}/git"