dhcpcd: upgrade to 10.3.2 and tidy debug packaging
cover dhcpcd: upgrade to 10.3.2 and tidy debug packaging
These changes are backported from master.
This small series updates the dhcpcd recipe:
- dhcpcd: remove obsolete explicit debug packaging, since the .debug directories are packaged automatically by default and the explicit packaging is redundant.
- dhcpcd: upgrade 10.3.1 -> 10.3.2, refreshing the associated patches.
Both commits are cherry-picked from master onto the wrynose branch.
Richard Purdie (1):
dhcpcd: upgrade 10.3.1 -> 10.3.2
Ross Burton (1):
dhcpcd: remove obsolete explicit debug packaging
.../dhcpcd/{dhcpcd_10.3.1.bb => dhcpcd_10.3.2.bb} | 4 +---
...20-resolv.conf-improve-the-sitation-of-working-with-.patch | 2 +-
...001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch | 4 ++--
.../0001-remove-INCLUDEDIR-to-prevent-build-issues.patch | 4 ++--
4 files changed, 6 insertions(+), 8 deletions(-)
rename meta/recipes-connectivity/dhcpcd/{dhcpcd_10.3.1.bb => dhcpcd_10.3.2.bb} (95%)PATCH 1/2 dhcpcd: remove obsolete explicit debug packaging
From: Ross Burton <[email protected]>
The .debug directories are packaged automatically by default, so this is redundant.
--- meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb +0 -2
@@ -67,5 +67,3 @@ do_install:append () { chmod 700 ${D}${DBDIR} chown dhcpcd:dhcpcd ${D}${DBDIR} } - -FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
Re: [OE-core] [wrynose][PATCH 1/2] dhcpcd: remove obsolete explicit debug packaging
Quoted 18 lines · Jaipaul Cheernam via lists.openembedded.org
From: Ross Burton <[email protected]>
The .debug directories are packaged automatically by default, so this is redundant.
Signed-off-by Ross Burton <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 8c3e8394c53581fd6b1d69669f6e0668c5af9d13)Signed-off-by Jaipaul Cheernam <[email protected]>--- meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb | 2 -- 1 file changed, 2 deletions(-)meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb +0
-0
meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb do_install:append () { · line 71
Quoted 5 lines
meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb +0
-2@@ -67,5 +67,3 @@ do_install:append () { chmod 700 ${D}${DBDIR} chown dhcpcd:dhcpcd ${D}${DBDIR} } - -FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug"
Hello,
This is a cleanup and is not acceptable for merge into stable branches per stable policy.
So, I did not take this one but I did take the following dhcpcd upgrade.
Thanks!
Signature · 2 lines
Yoann Congal Smile ECS
PATCH 2/2 dhcpcd: upgrade 10.3.1 -> 10.3.2
In reply to Jaipaul CheernamFrom: Richard Purdie <[email protected]>
---
.../dhcpcd/{dhcpcd_10.3.1.bb => dhcpcd_10.3.2.bb} | 2 +-
...20-resolv.conf-improve-the-sitation-of-working-with-.patch | 2 +-
...001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch | 4 ++--
.../0001-remove-INCLUDEDIR-to-prevent-build-issues.patch | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-connectivity/dhcpcd/{dhcpcd_10.3.1.bb => dhcpcd_10.3.2.bb} (97%)meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.2.bb renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_10.3.1.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma file://CVE-2026-56117.patch \ " -SRCREV = "42ff6d2548209af3185473e6cb6f9d235c48bbf4" +SRCREV = "243ad84ac67a87d631ff7eb83b2eed2727acebb5" # Doesn't use automake so we can't do out-of-tree builds inherit pkgconfig autotools-brokensep systemd useradd
meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +1 -1
@@ -1,4 +1,4 @@ -From d1581ce103db0a5db0b1761907fff9ddd6b55a8a Mon Sep 17 00:00:00 2001 +From c91f9cdc0ef56fa64f6ffdd811cc5b0e41991b2e Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Wed, 9 Nov 2022 16:33:18 +0800 Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd
meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch +2 -2
@@ -1,4 +1,4 @@ -From e9b1376c59b15e7b03611429187d9d89167154b5 Mon Sep 17 00:00:00 2001 +From dd892eba0147120efdcae923746c444a9d2a76d2 Mon Sep 17 00:00:00 2001 From: Lei Maohui <[email protected]> Date: Fri, 10 Mar 2023 03:48:46 +0000 Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
@@ -29,7 +29,7 @@ Signed-off-by: Lei Maohui <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in -index 91fdde2c..b467dc3b 100644 +index ebbf06c0..c7ffee6b 100644 --- a/src/dhcpcd.8.in +++ b/src/dhcpcd.8.in @@ -826,7 +826,7 @@ Configuration file for dhcpcd.
meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch +2 -2
@@ -1,4 +1,4 @@ -From c2ebc32112e0cd29390b4dc951b65efae36d607b Mon Sep 17 00:00:00 2001 +From 0775eb1b965bbf9b0efb0b1c42c3adf3d8cd31cb Mon Sep 17 00:00:00 2001 From: Stefano Cappa <[email protected]> Date: Sun, 13 Jan 2019 01:50:52 +0100 Subject: [PATCH] remove INCLUDEDIR to prevent build issues
@@ -11,7 +11,7 @@ Signed-off-by: Stefano Cappa <[email protected]> 1 file changed, 5 deletions(-) diff --git a/configure b/configure -index a60da137..3673de8b 100755 +index e9c08f18..3f0770b7 100755 --- a/configure +++ b/configure @@ -26,7 +26,6 @@ BUILD=