From ce8970ad466d837c4f0ae89c835614bfdef04fdc Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 3 Sep 2024 16:32:40 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb | 61 ++++++++++++++++++++++ meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb | 61 ---------------------- ...8-Fix-conflict-error-when-enable-multilib.patch | 7 ++- ...remove-INCLUDEDIR-to-prevent-build-issues.patch | 9 ++-- 4 files changed, 68 insertions(+), 70 deletions(-) create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb delete mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.bb new file mode 100644 index 0000000000..0ae9db911c --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.10.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=d296c4bec306f351e676705aaf237c8c" + +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 = "ab5ec18e755c1bb450c74d3a4657ea48d0f7f314" +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 ${UNPACKDIR}/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.8.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.bb deleted file mode 100644 index 43de279cfd..0000000000 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.0.8.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 = "a15ba1987c264eaa06c2655ddd0891aa5ac48c09" -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 ${UNPACKDIR}/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 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 @@ -From 5d5ba8a2b8010db6bee68bd712f829cb737c9ac1 Mon Sep 17 00:00:00 2001 +From 1115784dfdf2e7095cf599f9becef705ac57f80e 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,16 +24,15 @@ 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 93232840..09930a31 100644 +index 04bf7d90..9cf10d24 100644 --- a/src/dhcpcd.8.in +++ b/src/dhcpcd.8.in -@@ -824,7 +824,7 @@ Configuration file for dhcpcd. +@@ -826,7 +826,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. 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 @@ -From ec9fc4e6086e1dbe0ac2f94a8a088a571596a581 Mon Sep 17 00:00:00 2001 +From 69babef33b0ee4c60d8821797777b9affedd47da 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,13 +6,12 @@ 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 5237b0e2..7220718b 100755 +index 1a772b02..0f915b39 100755 --- a/configure +++ b/configure @@ -26,7 +26,6 @@ BUILD= @@ -23,7 +22,7 @@ index 5237b0e2..7220718b 100755 DEBUG= FORK= STATIC= -@@ -86,7 +85,6 @@ for x do +@@ -89,7 +88,6 @@ for x do --mandir) MANDIR=$var;; --datadir) DATADIR=$var;; --with-ccopts|CFLAGS) CFLAGS=$var;; @@ -31,7 +30,7 @@ index 5237b0e2..7220718b 100755 CC) CC=$var;; CPPFLAGS) CPPFLAGS=$var;; PKG_CONFIG) PKG_CONFIG=$var;; -@@ -343,9 +341,6 @@ if [ -n "$CPPFLAGS" ]; then +@@ -346,9 +344,6 @@ if [ -n "$CPPFLAGS" ]; then echo "CPPFLAGS=" >>$CONFIG_MK echo "CPPFLAGS+= $CPPFLAGS" >>$CONFIG_MK fi -- cgit v1.2.3-54-g00ecf