diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-12-27 21:07:30 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-30 11:03:07 +0000 |
commit | c541bd3f3cc1d90a83d61398ad015716dfded2e5 (patch) | |
tree | 85080f8d219a0e777e5506d8e6495021dee83a7a /meta/recipes-connectivity | |
parent | ca78b23f57519c6e82008bd3534a33569046910d (diff) | |
download | poky-c541bd3f3cc1d90a83d61398ad015716dfded2e5.tar.gz |
dhcpcd: upgrade 10.0.5 -> 10.0.6
0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch
0001-remove-INCLUDEDIR-to-prevent-build-issues.patch
refreshed for 10.0.6
Changelog:
==========
-privsep: Stop proxying stderr to console and fix some detachment issues
-non-privsep: Fix launcher hangup
-DHCP6: Allow the invalid interface name - to mean don't assign an address from a delegated prefix
-DHCP6: Load the configuration for the interface being activated from prefix delegation
(From OE-Core rev: 9f813cdbb789423219cb83affd40cd0f3c377485)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb (renamed from meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch | 10 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcpcd/files/0001-remove-INCLUDEDIR-to-prevent-build-issues.patch | 14 |
3 files changed, 11 insertions, 15 deletions
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb index c2dee267ba..6bde9b1f51 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb | |||
@@ -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 | ||
20 | SRCREV = "6baf4df467aaae89b026a089122d155c6eec3f19" | 20 | SRCREV = "1c8ae59836fa87b4c63c598087f0460ec20ed862" |
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | inherit pkgconfig autotools-brokensep systemd useradd | 23 | inherit 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 12998aada4..461d04bd1d 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 @@ | |||
1 | From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 | 1 | From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Fri, 10 Mar 2023 03:48:46 +0000 | 3 | Date: Fri, 10 Mar 2023 03:48:46 +0000 |
4 | Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. | 4 | Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib. |
@@ -24,15 +24,16 @@ versions. | |||
24 | 24 | ||
25 | Upstream-Status: Inappropriate [oe specific] | 25 | Upstream-Status: Inappropriate [oe specific] |
26 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 26 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
27 | |||
27 | --- | 28 | --- |
28 | src/dhcpcd.8.in | 2 +- | 29 | src/dhcpcd.8.in | 2 +- |
29 | 1 file changed, 1 insertion(+), 1 deletion(-) | 30 | 1 file changed, 1 insertion(+), 1 deletion(-) |
30 | 31 | ||
31 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in | 32 | diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in |
32 | index bc6b3b5..791f2ba 100644 | 33 | index 93232840..09930a31 100644 |
33 | --- a/src/dhcpcd.8.in | 34 | --- a/src/dhcpcd.8.in |
34 | +++ b/src/dhcpcd.8.in | 35 | +++ b/src/dhcpcd.8.in |
35 | @@ -821,7 +821,7 @@ Configuration file for dhcpcd. | 36 | @@ -824,7 +824,7 @@ Configuration file for dhcpcd. |
36 | If you always use the same options, put them here. | 37 | If you always use the same options, put them here. |
37 | .It Pa @SCRIPT@ | 38 | .It Pa @SCRIPT@ |
38 | Bourne shell script that is run to configure or de-configure an interface. | 39 | Bourne shell script that is run to configure or de-configure an interface. |
@@ -41,6 +42,3 @@ index bc6b3b5..791f2ba 100644 | |||
41 | Linux | 42 | Linux |
42 | .Pa /dev | 43 | .Pa /dev |
43 | management modules. | 44 | management modules. |
44 | -- | ||
45 | 2.34.1 | ||
46 | |||
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 37d2344438..c54942be4b 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 @@ | |||
1 | From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001 | 1 | From ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001 |
2 | From: Stefano Cappa <stefano.cappa.ks89@gmail.com> | 2 | From: Stefano Cappa <stefano.cappa.ks89@gmail.com> |
3 | Date: Sun, 13 Jan 2019 01:50:52 +0100 | 3 | Date: Sun, 13 Jan 2019 01:50:52 +0100 |
4 | Subject: [PATCH] remove INCLUDEDIR to prevent build issues | 4 | Subject: [PATCH] remove INCLUDEDIR to prevent build issues |
@@ -6,15 +6,16 @@ Subject: [PATCH] remove INCLUDEDIR to prevent build issues | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | 7 | ||
8 | Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com> | 8 | Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com> |
9 | |||
9 | --- | 10 | --- |
10 | configure | 5 ----- | 11 | configure | 5 ----- |
11 | 1 file changed, 5 deletions(-) | 12 | 1 file changed, 5 deletions(-) |
12 | 13 | ||
13 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
14 | index 6c81e0db..32dea2b4 100755 | 15 | index 5237b0e2..7220718b 100755 |
15 | --- a/configure | 16 | --- a/configure |
16 | +++ b/configure | 17 | +++ b/configure |
17 | @@ -20,7 +20,6 @@ BUILD= | 18 | @@ -26,7 +26,6 @@ BUILD= |
18 | HOST= | 19 | HOST= |
19 | HOSTCC= | 20 | HOSTCC= |
20 | TARGET= | 21 | TARGET= |
@@ -22,7 +23,7 @@ index 6c81e0db..32dea2b4 100755 | |||
22 | DEBUG= | 23 | DEBUG= |
23 | FORK= | 24 | FORK= |
24 | STATIC= | 25 | STATIC= |
25 | @@ -72,7 +71,6 @@ for x do | 26 | @@ -86,7 +85,6 @@ for x do |
26 | --mandir) MANDIR=$var;; | 27 | --mandir) MANDIR=$var;; |
27 | --datadir) DATADIR=$var;; | 28 | --datadir) DATADIR=$var;; |
28 | --with-ccopts|CFLAGS) CFLAGS=$var;; | 29 | --with-ccopts|CFLAGS) CFLAGS=$var;; |
@@ -30,7 +31,7 @@ index 6c81e0db..32dea2b4 100755 | |||
30 | CC) CC=$var;; | 31 | CC) CC=$var;; |
31 | CPPFLAGS) CPPFLAGS=$var;; | 32 | CPPFLAGS) CPPFLAGS=$var;; |
32 | PKG_CONFIG) PKG_CONFIG=$var;; | 33 | PKG_CONFIG) PKG_CONFIG=$var;; |
33 | @@ -309,9 +307,6 @@ if [ -n "$CPPFLAGS" ]; then | 34 | @@ -343,9 +341,6 @@ if [ -n "$CPPFLAGS" ]; then |
34 | echo "CPPFLAGS=" >>$CONFIG_MK | 35 | echo "CPPFLAGS=" >>$CONFIG_MK |
35 | echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK | 36 | echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK |
36 | fi | 37 | fi |
@@ -40,6 +41,3 @@ index 6c81e0db..32dea2b4 100755 | |||
40 | if [ -n "$LDFLAGS" ]; then | 41 | if [ -n "$LDFLAGS" ]; then |
41 | echo "LDFLAGS=" >>$CONFIG_MK | 42 | echo "LDFLAGS=" >>$CONFIG_MK |
42 | echo "LDFLAGS+= $LDFLAGS" >>$CONFIG_MK | 43 | echo "LDFLAGS+= $LDFLAGS" >>$CONFIG_MK |
43 | -- | ||
44 | 2.17.2 (Apple Git-113) | ||
45 | |||