> -----Original Message-----
> From: [email protected]
> <[email protected]> On Behalf Of Petr Vorel
> Sent: den 27 november 2022 23:23
> To: [email protected]
> Cc: Petr Vorel <[email protected]>; Richard Purdie
> <[email protected]>; Daniel Díaz <[email protected]>;
> Khem Raj <[email protected]>; Alexandre Belloni
> <[email protected]>; Changhyeok Bae <[email protected]>;
> Alexander Kanavin <[email protected]>
> Subject: [OE-core] [PATCH v3 1/1] iputils: update to 20221126
>
> From: Petr Vorel <[email protected]>
>
> This release removed: ninfod, rarpd, rdisc.
> Remove also related, not yet upstreamed patch.
>
> Signed-off-by: Petr Vorel <[email protected]>
> ---
> Hi,
>
> changes v2-v3:
> * Remove ninfod related code (Alexandre Belloni):
> ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod', '', d)} \
>
> Hope now it's correct (Alexandre Belloni is going to test v2 without
> this line).
>
> Kind regards,
> Petr
>
> .../0001-rarpd-rdisc-Drop-PrivateUsers.patch | 27 -------------------
> ...putils_20211215.bb => iputils_20221126.bb} | 20 +++-----------
> 2 files changed, 3 insertions(+), 44 deletions(-)
> delete mode 100644
> meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
> rename meta/recipes-extended/iputils/{iputils_20211215.bb =>
> iputils_20221126.bb} (64%)
>
> diff --git
> a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
>
> b/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
> deleted file mode 100644
> index c61e39dc80..0000000000
> ---
> a/meta/recipes-extended/iputils/iputils/0001-rarpd-rdisc-Drop-PrivateUsers.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From dfeeb3f1328d09f516edeb6349bd63e3c87f9397 Mon Sep 17 00:00:00 2001
> -From: Alex Kiernan <[email protected]>
> -Date: Thu, 13 Feb 2020 06:08:45 +0000
> -Subject: [PATCH] rarpd:Drop PrivateUsers
> -
> -rarpd cannot gain the necessary capabilities with
> -PrivateUsers enabled.
> -
> -Upstream-Status: Pending
> -Signed-off-by: Alex Kiernan <[email protected]>
> -
> ----
> - systemd/rarpd.service.in | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/systemd/rarpd.service.in b/systemd/rarpd.service.in
> -index e600c10..f5d7621 100644
> ---- a/systemd/rarpd.service.in
> -+++ b/systemd/rarpd.service.in
> -@@ -12,7 +12,6 @@ AmbientCapabilities=CAP_NET_RAW
> - DynamicUser=yes
> - PrivateTmp=yes
> - PrivateDevices=yes
> --PrivateUsers=yes
> - ProtectSystem=strict
> - ProtectHome=yes
> - ProtectControlGroups=yes
> diff --git a/meta/recipes-extended/iputils/iputils_20211215.bb
> b/meta/recipes-extended/iputils/iputils_20221126.bb
> similarity index 64%
> rename from meta/recipes-extended/iputils/iputils_20211215.bb
> rename to meta/recipes-extended/iputils/iputils_20221126.bb
> index 3ddce0be54..ad9c275e0c 100644
> --- a/meta/recipes-extended/iputils/iputils_20211215.bb
> +++ b/meta/recipes-extended/iputils/iputils_20221126.bb
> @@ -11,9 +11,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=bb64c89bb0e23b72930d2380894c47a1"
> DEPENDS = "gnutls"
>
> SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
> - file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \
> "
Since there no longer is any patch, the above can be changed to:
SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https"
> -SRCREV = "1d1e7c43210d8af316a41cb2c53d612a4c16f34d"
> +SRCREV = "5ffabc4190cab975c7332645259e286a032e183b"
>
> S = "${WORKDIR}/git"
>
> @@ -23,14 +22,11 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
> # breaks the version order.
> CVE_CHECK_IGNORE += "CVE-2000-1213 CVE-2000-1214"
>
> -PACKAGECONFIG ??= "libcap rarpd \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod',
> '', d)} \
> +PACKAGECONFIG ??= "libcap \
> ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
AFAICT after looking at the code, there is no longer any reason to
pass the systemd configuration as there is nothing related to systemd
being installed anymore. I.e., the above can be simplified to:
PACKAGECONFIG ??= "libcap"
and PACKAGECONFIG[systemd] below can be removed too. Unless of course
you are planning to add new systemd services in the not too distant
future, in which case you might as well leave it as it is.
> PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false
> -DNO_SETCAP_OR_SUID=true, libcap libcap-native"
> PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2"
> PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext"
> -PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false,"
> -PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false,"
> PACKAGECONFIG[systemd] =
> "-Dsystemdunitdir=${systemd_system_unitdir},,systemd"
> PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true
> -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt"
>
> @@ -43,9 +39,7 @@ ALTERNATIVE_PRIORITY = "100"
> ALTERNATIVE:${PN}-ping = "ping"
> ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping"
>
> -SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff
> ${PN}-rdisc \
> - ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd',
> '', d)} \
> - ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod',
> '', d)}"
> +SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff"
> PACKAGES += "${SPLITPKGS}"
>
> ALLOW_EMPTY:${PN} = "1"
> @@ -56,11 +50,3 @@ FILES:${PN}-ping = "${base_bindir}/ping.${BPN}"
> FILES:${PN}-arping = "${base_bindir}/arping"
> FILES:${PN}-tracepath = "${base_bindir}/tracepath"
> FILES:${PN}-clockdiff = "${base_bindir}/clockdiff"
> -FILES:${PN}-rarpd = "${base_sbindir}/rarpd
> ${systemd_system_unitdir}/[email protected]"
> -FILES:${PN}-rdisc = "${base_sbindir}/rdisc"
> -FILES:${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh"
> -
> -SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
> '${PN}-ninfod', '', d)} \
> - ${PN}-rdisc"
> -SYSTEMD_SERVICE:${PN}-ninfod = "ninfod.service"
> -SYSTEMD_SERVICE:${PN}-rdisc = "rdisc.service"
Since you remove all of the SYSTEMD_* variables, you should also
remove systemd from the inherit line.
> --
> 2.38.1
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173892):
https://lists.openembedded.org/g/openembedded-core/message/173892
Mute This Topic: https://lists.openembedded.org/mt/95298551/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
