From 91f8d07d38549d2c5e0b5b4c6ddc565ccf126be9 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 4 Jun 2025 16:44:41 +0800 Subject: dhcpcd: upgrade 10.2.2 -> 10.2.4 0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch refreshed for 10.2.4 (From OE-Core rev: 7e74593f4b341deef995adba5790eacffcfd41f1) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb | 68 ---------------------- meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb | 68 ++++++++++++++++++++++ ...onf-improve-the-sitation-of-working-with-.patch | 8 +-- 3 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb deleted file mode 100644 index f9dfd2e245..0000000000 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.2.bb +++ /dev/null @@ -1,68 +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=4dda5beb433a809f2e0aeffbf9da3d91" - -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 = "f6983c18dbf7989f43a2838beeaf62a54c53ff1d" -S = "${WORKDIR}/git" - -# Doesn't use automake so we can't do out-of-tree builds -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" - -# This isn't autoconf but is instead a configure script that tries to look like -# autoconf, so just run it directly. -do_configure() { - oe_runconf -} - -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.2.4.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb new file mode 100644 index 0000000000..dee921d21c --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb @@ -0,0 +1,68 @@ +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=4dda5beb433a809f2e0aeffbf9da3d91" + +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 = "93df2b254caf9639f9ffb66e0fe2b584eeba6220" +S = "${WORKDIR}/git" + +# Doesn't use automake so we can't do out-of-tree builds +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" + +# This isn't autoconf but is instead a configure script that tries to look like +# autoconf, so just run it directly. +do_configure() { + oe_runconf +} + +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-20-resolv.conf-improve-the-sitation-of-working-with-.patch b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch index 4f687b0292..512e33aebf 100644 --- a/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch +++ b/meta/recipes-connectivity/dhcpcd/files/0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch @@ -1,4 +1,4 @@ -From 33710a648a805d96abf49d5adf6ca55b89f9c858 Mon Sep 17 00:00:00 2001 +From d1581ce103db0a5db0b1761907fff9ddd6b55a8a Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 9 Nov 2022 16:33:18 +0800 Subject: [PATCH] 20-resolv.conf: improve the sitation of working with systemd @@ -27,7 +27,7 @@ Signed-off-by: Chen Qi 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/hooks/20-resolv.conf b/hooks/20-resolv.conf -index 7c29e276..becc019f 100644 +index bd0b0df5..9c7721de 100644 --- a/hooks/20-resolv.conf +++ b/hooks/20-resolv.conf @@ -11,8 +11,12 @@ nocarrier_roaming_dir="$state_dir/roaming" @@ -59,7 +59,7 @@ index 7c29e276..becc019f 100644 fi rm -f "$cf" } -@@ -170,7 +179,7 @@ add_resolv_conf() +@@ -179,7 +188,7 @@ add_resolv_conf() for x in ${new_domain_name_servers}; do conf="${conf}nameserver $x$NL" done @@ -68,7 +68,7 @@ index 7c29e276..becc019f 100644 [ -n "$ifmetric" ] && export IF_METRIC="$ifmetric" printf %s "$conf" | "$resolvconf" -a "$ifname" return $? -@@ -186,7 +195,7 @@ add_resolv_conf() +@@ -195,7 +204,7 @@ add_resolv_conf() remove_resolv_conf() { -- cgit v1.2.3-54-g00ecf