From c541bd3f3cc1d90a83d61398ad015716dfded2e5 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 27 Dec 2023 21:07:30 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb | 61 ---------------------- meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb | 61 ++++++++++++++++++++++ ...8-Fix-conflict-error-when-enable-multilib.patch | 10 ++-- ...remove-INCLUDEDIR-to-prevent-build-issues.patch | 14 +++-- 4 files changed, 71 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb (limited to 'meta/recipes-connectivity/dhcpcd') diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb deleted file mode 100644 index c2dee267ba..0000000000 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.5.bb +++ /dev/null @@ -1,61 +0,0 @@ -SECTION = "console/network" -SUMMARY = "dhcpcd - a DHCP client" -DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ - computer to work on the attached networks without trouble \ - and mostly without configuration." - -HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ba9c7e534853aaf3de76c905b2410ffd" - -SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ - file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ - file://dhcpcd.service \ - file://dhcpcd@.service \ - file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ - " - -SRCREV = "6baf4df467aaae89b026a089122d155c6eec3f19" -S = "${WORKDIR}/git" - -inherit pkgconfig autotools-brokensep systemd useradd - -SYSTEMD_SERVICE:${PN} = "dhcpcd.service" - -PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" - -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" -# ntp conflicts with chrony -PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp" -PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony" -PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" - -# add option to override DBDIR location -DBDIR ?= "${localstatedir}/lib/${BPN}" - -EXTRA_OECONF = "--enable-ipv4 \ - --dbdir=${DBDIR} \ - --sbindir=${base_sbindir} \ - --runstatedir=/run \ - --enable-privsep \ - --privsepuser=dhcpcd \ - --with-hooks \ - --with-eghooks \ - " - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" - -do_install:append () { - # install systemd unit files - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} - - chmod 700 ${D}${DBDIR} - chown dhcpcd:dhcpcd ${D}${DBDIR} -} - -FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb new file mode 100644 index 0000000000..6bde9b1f51 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.6.bb @@ -0,0 +1,61 @@ +SECTION = "console/network" +SUMMARY = "dhcpcd - a DHCP client" +DESCRIPTION = "dhcpcd runs on your machine and silently configures your \ + computer to work on the attached networks without trouble \ + and mostly without configuration." + +HOMEPAGE = "http://roy.marples.name/projects/dhcpcd/" + +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba9c7e534853aaf3de76c905b2410ffd" + +SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=master \ + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ + file://dhcpcd.service \ + file://dhcpcd@.service \ + file://0001-dhcpcd.8-Fix-conflict-error-when-enable-multilib.patch \ + " + +SRCREV = "1c8ae59836fa87b4c63c598087f0460ec20ed862" +S = "${WORKDIR}/git" + +inherit pkgconfig autotools-brokensep systemd useradd + +SYSTEMD_SERVICE:${PN} = "dhcpcd.service" + +PACKAGECONFIG ?= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" + +PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev,udev" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6" +# ntp conflicts with chrony +PACKAGECONFIG[ntp] = "--with-hook=ntp, , ,ntp" +PACKAGECONFIG[chrony] = "--with-hook=ntp, , ,chrony" +PACKAGECONFIG[ypbind] = "--with-eghook=yp, , ,ypbind-mt" + +# add option to override DBDIR location +DBDIR ?= "${localstatedir}/lib/${BPN}" + +EXTRA_OECONF = "--enable-ipv4 \ + --dbdir=${DBDIR} \ + --sbindir=${base_sbindir} \ + --runstatedir=/run \ + --enable-privsep \ + --privsepuser=dhcpcd \ + --with-hooks \ + --with-eghooks \ + " + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system -d ${DBDIR} -M -s /bin/false -U dhcpcd" + +do_install:append () { + # install systemd unit files + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/dhcpcd*.service ${D}${systemd_system_unitdir} + + chmod 700 ${D}${DBDIR} + chown dhcpcd:dhcpcd ${D}${DBDIR} +} + +FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" 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 @@ -From 4915a7e52fcea8fe283a842890a1e726b1e26b10 Mon Sep 17 00:00:00 2001 +From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 From: Lei Maohui 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 + --- 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 - 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 @@ -From aa9e3982c1e75ad49945a62f5e262279c7a905a4 Mon Sep 17 00:00:00 2001 +From ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001 From: Stefano Cappa 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 + --- 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) - -- cgit v1.2.3-54-g00ecf