mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
ca78b23f57
commit
c541bd3f3c
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
|
||||
file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \
|
||||
"
|
||||
|
||||
SRCREV = "6baf4df467aaae89b026a089122d155c6eec3f19"
|
||||
SRCREV = "1c8ae59836fa87b4c63c598087f0460ec20ed862"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit pkgconfig autotools-brokensep systemd useradd
|
||||
@@ -1,4 +1,4 @@
|
||||
From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001
|
||||
From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@fujitsu.com>
|
||||
Date: Fri, 10 Mar 2023 03:48:46 +0000
|
||||
Subject: [PATCH] dhcpcd.8: Fix conflict error when enable multilib.
|
||||
@@ -24,15 +24,16 @@ versions.
|
||||
|
||||
Upstream-Status: Inappropriate [oe specific]
|
||||
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
|
||||
|
||||
---
|
||||
src/dhcpcd.8.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/dhcpcd.8.in b/src/dhcpcd.8.in
|
||||
index bc6b3b5..791f2ba 100644
|
||||
index 93232840..09930a31 100644
|
||||
--- a/src/dhcpcd.8.in
|
||||
+++ b/src/dhcpcd.8.in
|
||||
@@ -821,7 +821,7 @@ Configuration file for dhcpcd.
|
||||
@@ -824,7 +824,7 @@ Configuration file for dhcpcd.
|
||||
If you always use the same options, put them here.
|
||||
.It Pa @SCRIPT@
|
||||
Bourne shell script that is run to configure or de-configure an interface.
|
||||
@@ -41,6 +42,3 @@ index bc6b3b5..791f2ba 100644
|
||||
Linux
|
||||
.Pa /dev
|
||||
management modules.
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001
|
||||
From ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001
|
||||
From: Stefano Cappa <stefano.cappa.ks89@gmail.com>
|
||||
Date: Sun, 13 Jan 2019 01:50:52 +0100
|
||||
Subject: [PATCH] remove INCLUDEDIR to prevent build issues
|
||||
@@ -6,15 +6,16 @@ Subject: [PATCH] remove INCLUDEDIR to prevent build issues
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Stefano Cappa <stefano.cappa.ks89@gmail.com>
|
||||
|
||||
---
|
||||
configure | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 6c81e0db..32dea2b4 100755
|
||||
index 5237b0e2..7220718b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -20,7 +20,6 @@ BUILD=
|
||||
@@ -26,7 +26,6 @@ BUILD=
|
||||
HOST=
|
||||
HOSTCC=
|
||||
TARGET=
|
||||
@@ -22,7 +23,7 @@ index 6c81e0db..32dea2b4 100755
|
||||
DEBUG=
|
||||
FORK=
|
||||
STATIC=
|
||||
@@ -72,7 +71,6 @@ for x do
|
||||
@@ -86,7 +85,6 @@ for x do
|
||||
--mandir) MANDIR=$var;;
|
||||
--datadir) DATADIR=$var;;
|
||||
--with-ccopts|CFLAGS) CFLAGS=$var;;
|
||||
@@ -30,7 +31,7 @@ index 6c81e0db..32dea2b4 100755
|
||||
CC) CC=$var;;
|
||||
CPPFLAGS) CPPFLAGS=$var;;
|
||||
PKG_CONFIG) PKG_CONFIG=$var;;
|
||||
@@ -309,9 +307,6 @@ if [ -n "$CPPFLAGS" ]; then
|
||||
@@ -343,9 +341,6 @@ if [ -n "$CPPFLAGS" ]; then
|
||||
echo "CPPFLAGS=" >>$CONFIG_MK
|
||||
echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK
|
||||
fi
|
||||
@@ -40,6 +41,3 @@ index 6c81e0db..32dea2b4 100755
|
||||
if [ -n "$LDFLAGS" ]; then
|
||||
echo "LDFLAGS=" >>$CONFIG_MK
|
||||
echo "LDFLAGS+= $LDFLAGS" >>$CONFIG_MK
|
||||
--
|
||||
2.17.2 (Apple Git-113)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user