diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-19 11:40:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-20 11:57:28 +0000 |
| commit | d072d02acddf31c9c29e5fc1f33c0188a0468e70 (patch) | |
| tree | 8261f1c69d6c60600012a741290993f32dac8ddb | |
| parent | 8dafdda77df99cb496714b551fc54aa0fb918b89 (diff) | |
| download | poky-d072d02acddf31c9c29e5fc1f33c0188a0468e70.tar.gz | |
resolvconf: update 1.87 -> 1.91
Drop patch as issue resolved upstream.
(From OE-Core rev: a8accf2a042f8a8cbba350c6de20152efeddd747)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf/fix-path-for-busybox.patch | 20 | ||||
| -rw-r--r-- | meta/recipes-connectivity/resolvconf/resolvconf_1.91.bb (renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb) | 3 |
2 files changed, 1 insertions, 22 deletions
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 @@ | |||
| 1 | |||
| 2 | busybox installs readlink into /usr/bin, so ensure /usr/bin | ||
| 3 | is in the path. | ||
| 4 | |||
| 5 | Upstream-Status: Submitted | ||
| 6 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 7 | |||
| 8 | Index: resolvconf-1.76/etc/resolvconf/update.d/libc | ||
| 9 | =================================================================== | ||
| 10 | --- resolvconf-1.76.orig/etc/resolvconf/update.d/libc | ||
| 11 | +++ resolvconf-1.76/etc/resolvconf/update.d/libc | ||
| 12 | @@ -16,7 +16,7 @@ | ||
| 13 | # | ||
| 14 | |||
| 15 | set -e | ||
| 16 | -PATH=/sbin:/bin | ||
| 17 | +PATH=/sbin:/bin:/usr/bin | ||
| 18 | |||
| 19 | [ -x /lib/resolvconf/list-records ] || exit 1 | ||
| 20 | |||
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.87.bb b/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" | |||
| 12 | RDEPENDS:${PN} = "bash" | 12 | RDEPENDS:${PN} = "bash" |
| 13 | 13 | ||
| 14 | SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \ | 14 | SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=unstable \ |
| 15 | file://fix-path-for-busybox.patch \ | ||
| 16 | file://99_resolvconf \ | 15 | file://99_resolvconf \ |
| 17 | " | 16 | " |
| 18 | 17 | ||
| 19 | SRCREV = "1dda36d8465e335c60190c41e7185d782da1bd7b" | 18 | SRCREV = "859209d573e7aec0e95d812c6b52444591a628d1" |
| 20 | 19 | ||
| 21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
| 22 | 21 | ||
