summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-09-03 16:32:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-04 12:38:44 +0100
commitce8970ad466d837c4f0ae89c835614bfdef04fdc (patch)
treeed8d00628766a77210bd67d006361eeff6c2ab89
parentde0f9cdbe16fc7e9a42522434b8c0a6fec510134 (diff)
downloadpoky-ce8970ad466d837c4f0ae89c835614bfdef04fdc.tar.gz
dhcpcd: upgrade 10.0.8 -> 10.0.10
License-Update: Copyright year updated to 2024. 0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch 0001-remove-INCLUDEDIR-to-prevent-build-issues.patch refreshed for 10.0.10 Changelog: ========== - configure: add --enable-ntp - Force dumplease to parse stdin - holmanb authored and rsmarples committed - Improve and document prior. - linux: Prefer local over address when both in netlink RTA - IPv6: DUPLICATED could be announced by RTM_DELADDR - Fix prior patch which might also fix #333 - IPv6: Delay for LL address before delay for start - IPv6: make more readable (nfc) - DHCP6: Don't remove delegated prefix addresses on start or fail - privsep: Sweep ELE_ERROR away for BPF - DHCP6: Add commentary around why we read leases - linux: allow roaming without IFF_DORMANT - DHCP: Remove an assertation in get_lease if ia is NULL - DHCP6: Persist configuration on confirm/rebind failure - DHCP6: Don't remove state in DISCOVER - IPv4LL: Restart ARP probling on address conflict - DHCP: Handle option 108 correctly when receiving 0.0.0.0 OFFER - taoyl-g and rsmarples committed on Jul 25 - DHCP: No longer set interface mtu - IPv4LL: If we are not configuring, abort if address does not exist - IPv4LL: Harden the noconfigure option. - DHCP6: Remove the dhcp6_pd_addr packed struct - Update privsep-linux.c to allow statx (From OE-Core rev: 8d8e0bc93ed4fed5ce40be929976726fe28177ce) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb)4
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch7
-rw-r--r--meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch9
3 files changed, 9 insertions, 11 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb
index 43de279cfd..0ae9db911c 100644
--- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb
+++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "dhcpcd runs on your machine and silently configures your \
7HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" 7HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/"
8 8
9LICENSE = "BSD-2-Clause" 9LICENSE = "BSD-2-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=ba9c7e534853aaf3de76c905b2410ffd" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=d296c4bec306f351e676705aaf237c8c"
11 11
12SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \ 12SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \
13 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ 13 file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
17 file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ 17 file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
18 " 18 "
19 19
20SRCREV = "a15ba1987c264eaa06c2655ddd0891aa5ac48c09" 20SRCREV = "ab5ec18e755c1bb450c74d3a4657ea48d0f7f314"
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
23inherit pkgconfig autotools-brokensep systemd useradd 23inherit pkgconfig autotools-brokensep systemd useradd
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
index 461d04bd1d..b958110ef1 100644
--- a/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
+++ b/meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
@@ -1,4 +1,4 @@
1From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 1From 1115784dfdf2e7095cf599f9becef705ac57f80e Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@fujitsu.com> 2From: Lei Maohui <leimaohui@fujitsu.com>
3Date: Fri, 10 Mar 2023 03:48:46 +0000 3Date: Fri, 10 Mar 2023 03:48:46 +0000
4Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. 4Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
@@ -24,16 +24,15 @@ versions.
24 24
25Upstream-Status: Inappropriate [oe specific] 25Upstream-Status: Inappropriate [oe specific]
26Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> 26Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
27
28--- 27---
29 src/dhcpcd.8.in | 2 +- 28 src/dhcpcd.8.in | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-) 29 1 file changed, 1 insertion(+), 1 deletion(-)
31 30
32diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in 31diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
33index 93232840..09930a31 100644 32index 04bf7d90..9cf10d24 100644
34--- a/src/dhcpcd.8.in 33--- a/src/dhcpcd.8.in
35+++ b/src/dhcpcd.8.in 34+++ b/src/dhcpcd.8.in
36@@ -824,7 +824,7 @@ Configuration file for dhcpcd. 35@@ -826,7 +826,7 @@ Configuration file for dhcpcd.
37 If you always use the same options, put them here. 36 If you always use the same options, put them here.
38 .It Pa @SCRIPT@ 37 .It Pa @SCRIPT@
39 Bourne shell script that is run to configure or de-configure an interface. 38 Bourne shell script that is run to configure or de-configure an interface.
diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch b/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
index c54942be4b..8890c2d7dc 100644
--- a/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
+++ b/meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
@@ -1,4 +1,4 @@
1From ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001 1From 69babef33b0ee4c60d8821797777b9affedd47da Mon Sep 17 00:00:00 2001
2From: Stefano Cappa <stefano.cappa.ks89@gmail.com> 2From: Stefano Cappa <stefano.cappa.ks89@gmail.com>
3Date: Sun, 13 Jan 2019 01:50:52 +0100 3Date: Sun, 13 Jan 2019 01:50:52 +0100
4Subject: [PATCH] remove INCLUDEDIR to prevent build issues 4Subject: [PATCH] remove INCLUDEDIR to prevent build issues
@@ -6,13 +6,12 @@ Subject: [PATCH] remove INCLUDEDIR to prevent build issues
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com> 8Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com>
9
10--- 9---
11 configure | 5 ----- 10 configure | 5 -----
12 1 file changed, 5 deletions(-) 11 1 file changed, 5 deletions(-)
13 12
14diff --git a/configure b/configure 13diff --git a/configure b/configure
15index 5237b0e2..7220718b 100755 14index 1a772b02..0f915b39 100755
16--- a/configure 15--- a/configure
17+++ b/configure 16+++ b/configure
18@@ -26,7 +26,6 @@ BUILD= 17@@ -26,7 +26,6 @@ BUILD=
@@ -23,7 +22,7 @@ index 5237b0e2..7220718b 100755
23 DEBUG= 22 DEBUG=
24 FORK= 23 FORK=
25 STATIC= 24 STATIC=
26@@ -86,7 +85,6 @@ for x do 25@@ -89,7 +88,6 @@ for x do
27 --mandir) MANDIR=$var;; 26 --mandir) MANDIR=$var;;
28 --datadir) DATADIR=$var;; 27 --datadir) DATADIR=$var;;
29 --with-ccopts|CFLAGS) CFLAGS=$var;; 28 --with-ccopts|CFLAGS) CFLAGS=$var;;
@@ -31,7 +30,7 @@ index 5237b0e2..7220718b 100755
31 CC) CC=$var;; 30 CC) CC=$var;;
32 CPPFLAGS) CPPFLAGS=$var;; 31 CPPFLAGS) CPPFLAGS=$var;;
33 PKG_CONFIG) PKG_CONFIG=$var;; 32 PKG_CONFIG) PKG_CONFIG=$var;;
34@@ -343,9 +341,6 @@ if [ -n "$CPPFLAGS" ]; then 33@@ -346,9 +344,6 @@ if [ -n "$CPPFLAGS" ]; then
35 echo "CPPFLAGS=" >>$CONFIG_MK 34 echo "CPPFLAGS=" >>$CONFIG_MK
36 echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK 35 echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK
37 fi 36 fi