From bd468de87be18d654b43ae68300d586ce8508a9c Mon Sep 17 00:00:00 2001 From: wangmy Date: Mon, 25 Oct 2021 22:26:52 +0800 Subject: dhcpcd: upgrade 9.4.0 -> 9.4.1 0002-src-privsep-linux.c-add-support-for-arc-28.patch removed since it is included in 9.4.1 -License-Update: Copyright year updated to 2021. (From OE-Core rev: 85bf75384a60e3db5458153e46dcdeb756d05b47) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb | 58 -------------------- meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 57 ++++++++++++++++++++ ...rc-privsep-linux.c-add-support-for-arc-28.patch | 63 ---------------------- 3 files changed, 57 insertions(+), 121 deletions(-) delete mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb create mode 100644 meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb delete mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb deleted file mode 100644 index dbad8c8728..0000000000 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb +++ /dev/null @@ -1,58 +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=9674cc803c5d71306941e6e8b5c002f2" - -UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" - -SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ - file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ - file://0002-src-privsep-linux.c-add-support-for-arc-28.patch \ - file://dhcpcd.service \ - file://dhcpcd@.service \ - " - -SRC_URI[sha256sum] = "41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513" - -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" - -EXTRA_OECONF = "--enable-ipv4 \ - --dbdir=${localstatedir}/lib/${BPN} \ - --sbindir=${base_sbindir} \ - --runstatedir=/run \ - --enable-privsep \ - --privsepuser=dhcpcd \ - --with-hooks \ - --with-eghooks \ - " - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system -d ${localstatedir}/lib/${BPN} -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}${localstatedir}/lib/${BPN} - chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} -} - -FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb new file mode 100644 index 0000000000..4007a4bd2d --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -0,0 +1,57 @@ +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=d148485768fe85b9f1072b186a7e9b4d" + +UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" + +SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://dhcpcd.service \ + file://dhcpcd@.service \ + " + +SRC_URI[sha256sum] = "819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c" + +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" + +EXTRA_OECONF = "--enable-ipv4 \ + --dbdir=${localstatedir}/lib/${BPN} \ + --sbindir=${base_sbindir} \ + --runstatedir=/run \ + --enable-privsep \ + --privsepuser=dhcpcd \ + --with-hooks \ + --with-eghooks \ + " + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system -d ${localstatedir}/lib/${BPN} -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}${localstatedir}/lib/${BPN} + chown dhcpcd:dhcpcd ${D}${localstatedir}/lib/${BPN} +} + +FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch b/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch deleted file mode 100644 index 045f06a9aa..0000000000 --- a/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 8 Feb 2021 07:23:54 +0100 -Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) - -Fix the following build failure: - -privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" - # error "Platform does not support seccomp filter yet" - ^~~~~ -In file included from privsep-linux.c:36: -privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? - BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), - ^~~~~~~~~~~~~~~~~~ - -It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined -since kernel 5.2 and -https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 - -Detection of arc compact and arc v2 have been "copy/pasted" from -https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 - -Fixes: - - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 - -Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266] - -Signed-off-by: Fabrice Fontaine -Signed-off-by: Alexey Brodkin ---- - src/privsep-linux.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/privsep-linux.c b/src/privsep-linux.c -index 402667af..21d41a9a 100644 ---- a/src/privsep-linux.c -+++ b/src/privsep-linux.c -@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 - #elif defined(__x86_64__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 -+#elif defined(__arc__) -+# if defined(__A7__) -+# if (BYTE_ORDER == LITTLE_ENDIAN) -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT -+# else -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE -+# endif -+# elif defined(__HS__) -+# if (BYTE_ORDER == LITTLE_ENDIAN) -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2 -+# else -+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE -+# endif -+# else -+# error "Platform does not support seccomp filter yet" -+# endif - #elif defined(__arm__) - # ifndef EM_ARM - # define EM_ARM 40 --- -2.16.2 - -- cgit v1.2.3-54-g00ecf