Skip to contentSkip to conversation

iw: upgrade 5.4 -> 5.8

PATCH Superseded Changhyeok Bae 3 participants 5 messages Aug 31, 2020 – Sep 1, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iw: upgrade 5.4 -> 5.8

---
 meta/recipes-connectivity/iw/{iw_5.4.bb => iw_5.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/iw/{iw_5.4.bb => iw_5.8.bb} (85%)
meta/recipes-connectivity/iw/iw_5.8.bb renamed from meta/recipes-connectivity/iw/iw_5.4.bb +2 -2
similarity index 85%
rename from meta/recipes-connectivity/iw/iw_5.4.bb
rename to meta/recipes-connectivity/iw/iw_5.8.bb
index 9f58e49709..97ca66d66f 100644
@@ -14,8 +14,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
            file://separate-objdir.patch \
 "
 
-SRC_URI[md5sum] = "08a4f581a39dc62fa85d3af796d844b6"
-SRC_URI[sha256sum] = "943cd2446a6c7242fded3766d054ab2a214a3514b9a8b7e942fed8fb13c1370c"
+SRC_URI[md5sum] = "98129d64212bdbb408f009c56ed5c62a"
+SRC_URI[sha256sum] = "cd9125c7e560926d66b09977fe0f75e5365ffd05a15df67d86a421dc76f96a96"
 
 inherit pkgconfig
 
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/2 iputils: upgrade s20190709 -> s20200821

- libgcrypt is not required anymore because the md5 implementation was part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.

---
 .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
 ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
 ...-fix-systemd-Documentation-url-error.patch | 28 ----------
 ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
 4 files changed, 2 insertions(+), 140 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
 rename meta/recipes-extended/iputils/{iputils_s20190709.bb => iputils_s20200821.bb} (87%)
meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch deleted +0 -55
deleted file mode 100644
index b56804cebe..0000000000
@@ -1,55 +0,0 @@
-From 8576e0c218634e6f7ed1b6ff02fa164fb0c75f86 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <[email protected]>
-Date: Wed, 29 Apr 2020 03:50:32 +0000
-Subject: [PATCH] iputils_md5dig.h: Initialize libgcrypt
-
-Initialize libgcrypt on first use otherwise
-there comes below warning when check the status
-of the ninfod.service.
- # systemctl status ninfod.service
- * ninfod.service - Respond to IPv6 Node Information Queries
- Loaded: loaded (/lib/systemd/system/ninfod.service; enabled; vendor preset: enabled)
- Active: active (running) since Wed 2020-04-29 05:18:21 UTC; 36s ago
- Docs: man:ninfod(8)
- Main PID: 347 (ninfod)
- Tasks: 1 (limit: 9382)
- Memory: 1.2M
- CGroup: /system.slice/ninfod.service
- `-347 /sbin/ninfod -d
-
- Apr 29 05:18:21 intel-x86-64 systemd[1]: Started Respond to IPv6 Node Information Queries.
- Apr 29 05:18:24 intel-x86-64 ninfod[347]: Libgcrypt warning: missing initialization - please fix the application
-
-Upstream-Status: Inappropriate [the upstream avoids linking to crypto libraries in
-                   commit 214ed83 common: copy md5 implementation to iputils project]
-
-Signed-off-by: Mingli Yu <[email protected]>
----
- iputils_md5dig.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/iputils_md5dig.h b/iputils_md5dig.h
-index bfa7f02..3cc3fbf 100644
---- a/iputils_md5dig.h
-+++ b/iputils_md5dig.h
-@@ -24,8 +24,17 @@ typedef struct {
- 	gcry_md_hd_t dig;
- } iputils_md5dig_ctx;
- 
-+void maybeInit()
-+{
-+	if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
-+	{
-+		gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
-+	}
-+}
-+
- static void iputils_md5dig_init(iputils_md5dig_ctx *ctx)
- {
-+	maybeInit();
- 	if (gcry_md_open(&ctx->dig, GCRY_MD_MD5, 0) != GPG_ERR_NO_ERROR)
- 		abort();
- 	return;
--- 
-2.24.1
-
meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch deleted +0 -51

51 lines not on this page · raw message

meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch deleted +0 -28
deleted file mode 100644
index 03a3f5602d..0000000000
@@ -1,28 +0,0 @@
-From c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9 Mon Sep 17 00:00:00 2001
-From: Andrea Stevanato <[email protected]>
-Date: Tue, 5 Nov 2019 19:08:30 +0000
-Subject: [PATCH] ninfod: fix systemd Documentation url error
-
-systemd[1]: /usr/lib/systemd/system/ninfod.service:3: Invalid URL, ignoring: ninfod(8)
-
-Upstream-Status: Backport [https://github.com/iputils/iputils/commit/c1f1527eb30d4a5feebf9a0757582bbf7fe3eae9]
-Signed-off-by: Alex Kiernan <[email protected]>
----
- systemd/ninfod.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/ninfod.service.in b/systemd/ninfod.service.in
-index 5ab69ca00e96..8e79fcd9238e 100644
---- a/systemd/ninfod.service.in
-+++ b/systemd/ninfod.service.in
-@@ -1,6 +1,6 @@
- [Unit]
- Description=Respond to IPv6 Node Information Queries
--Documentation=ninfod(8)
-+Documentation=man:ninfod(8)
- Requires=network.target
- After=network.target
- 
--- 
-2.17.1
-
meta/recipes-extended/iputils/iputils_s20200821.bb renamed from meta/recipes-extended/iputils/iputils_s20190709.bb +2 -6
similarity index 87%
rename from meta/recipes-extended/iputils/iputils_s20190709.bb
rename to meta/recipes-extended/iputils/iputils_s20200821.bb
index 545f3d5e87..62d6a3c209 100644
@@ -11,12 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390"
 DEPENDS = "gnutls"
 
 SRC_URI = "git://github.com/iputils/iputils \
-           file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \
-           file://0001-ninfod-fix-systemd-Documentation-url-error.patch \
            file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
-           file://0001-iputils-Initialize-libgcrypt.patch \
            "
-SRCREV = "13e00847176aa23683d68fce1d17ffb523510946"
+SRCREV = "23c3782ae0c7f9c6ae59dbed8ad9204f8758542b"
 
 S = "${WORKDIR}/git"
 
@@ -26,11 +23,10 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)"
 # breaks the version order.
 CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214"
 
-PACKAGECONFIG ??= "libcap libgcrypt rarpd \
+PACKAGECONFIG ??= "libcap rarpd \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap"
-PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt"
 PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
 PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
 PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
Signature · 1 line
2.23.0
#2 lore raw

Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821

Quoted 5 lines · Changhyeok Bae

- libgcrypt is not required anymore because the md5 implementation was part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.

Quoted 10 lines
---
 .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
 ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
 ...-fix-systemd-Documentation-url-error.patch | 28 ----------
 ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
 4 files changed, 2 insertions(+), 140 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch
 delete mode 100644 meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch
 rename meta/recipes-extended/iputils/{iputils_s20190709.bb => iputils_s20200821.bb} (87%)

Hi,

Thanks for the upgrade. There seems to be an issue with tftpd:

https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389

Error:
Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires packagegroup-core-full-cmdline-extended, but none of the providers can be installed
- package packagegroup-core-full-cmdline-extended-1.0-r6.noarch requires iputils, but none of the providers can be installed
- conflicting requests
- nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
(try to add '--skip-broken' to skip uninstallable packages)

Any ideas what changed?

Cheers,

Richard

#3 lore raw

Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821

Hi Richard

Thank you for the report. I will look into it.

Best regards,
Changhyeok

2020년 9월 1일 (화) 오후 2:32, Richard Purdie <[email protected]>님이 작성:

Quoted 44 lines · Changhyeok Bae
Quoted 4 lines

- libgcrypt is not required anymore because the md5 implementation was part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.

Quoted 8 lines
---
 .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
 ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
 ...-fix-systemd-Documentation-url-error.patch | 28 ----------
 ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
 4 files changed, 2 insertions(+), 140 deletions(-)
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch

Quoted 1 line
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch

Quoted 1 line
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch

Quoted 1 line
 rename meta/recipes-extended/iputils/{iputils_s20190709.bb =>

iputils_s20200821.bb} (87%)

Hi,

Thanks for the upgrade. There seems to be an issue with tftpd:

https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389

Error:
Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires
packagegroup-core-full-cmdline-extended, but none of the providers can be installed
- package packagegroup-core-full-cmdline-extended-1.0-r6.noarch requires
iputils, but none of the providers can be installed
- conflicting requests
- nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
(try to add '--skip-broken' to skip uninstallable packages)

Any ideas what changed?

Cheers,

Richard

Signature · 2 lines
Thanks
Changhyeok
#4 lore raw

Re: [OE-Core][PATCH 2/2] iputils: upgrade s20190709 -> s20200821

I think tftpd option is now off by default, and we probably should disable it as well:

https://github.com/iputils/iputils/commit/737d8a91e394518d2ccdaf398bb16283eb8e4a81

Alex

Quoted 60 lines · Changhyeok Bae

Hi Richard

Thank you for the report. I will look into it.

Best regards,
Changhyeok

2020년 9월 1일 (화) 오후 2:32, Richard Purdie <
[email protected]>님이 작성:

Quoted 37 lines · Changhyeok Bae
Quoted 4 lines

- libgcrypt is not required anymore because the md5 implementation was part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.

Quoted 8 lines
---
 .../0001-iputils-Initialize-libgcrypt.patch   | 55 -------------------
 ...riable-name-to-avoid-colliding-with-.patch | 51 -----------------
 ...-fix-systemd-Documentation-url-error.patch | 28 ----------
 ...tils_s20190709.bb => iputils_s20200821.bb} |  8 +--
 4 files changed, 2 insertions(+), 140 deletions(-)
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-iputils-Initialize-libgcrypt.patch

Quoted 1 line
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch

Quoted 1 line
 delete mode 100644

meta/recipes-extended/iputils/iputils/0001-ninfod-fix-systemd-Documentation-url-error.patch

Quoted 1 line
 rename meta/recipes-extended/iputils/{iputils_s20190709.bb =>

iputils_s20200821.bb} (87%)

Hi,

Thanks for the upgrade. There seems to be an issue with tftpd:

https://autobuilder.yoctoproject.org/typhoon/#/builders/75/builds/2389

Error:
Problem: package packagegroup-core-full-cmdline-1.0-r6.noarch requires
packagegroup-core-full-cmdline-extended, but none of the providers can be installed
- package packagegroup-core-full-cmdline-extended-1.0-r6.noarch
requires iputils, but none of the providers can be installed
- conflicting requests
- nothing provides iputils-tftpd needed by iputils-s20200821-r0.core2_32
(try to add '--skip-broken' to skip uninstallable packages)

Quoted 7 lines

Any ideas what changed?

Cheers,

Richard

--
Thanks
Changhyeok