diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2020-09-02 00:53:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:47 +0100 |
commit | afb9b64fbd2b8e204295d9e79c5fee93a28be22a (patch) | |
tree | b4ac1c499911898a2f3a01a1e28c12c2fa6cec1a /meta/recipes-extended/iputils/iputils_s20190709.bb | |
parent | 532ddeb815d46c96325bb3c3badeb9270e597123 (diff) | |
download | poky-afb9b64fbd2b8e204295d9e79c5fee93a28be22a.tar.gz |
iputils: upgrade s20190709 -> s20200821
- libgcrypt is not required anymore because the md5 implementation was
part of this project.
- ninfod patches are upstreamed and other patch is not required anymore.
- Add tftpd in PACKAGECONFIG
(From OE-Core rev: 18a4086652562e061d728a83c97151f5c7552ece)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iputils/iputils_s20190709.bb')
-rw-r--r-- | meta/recipes-extended/iputils/iputils_s20190709.bb | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb deleted file mode 100644 index 545f3d5e87..0000000000 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | SUMMARY = "Network monitoring tools" | ||
2 | DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \ | ||
3 | tracepath, tracepath6, ping, ping6 and arping." | ||
4 | HOMEPAGE = "https://github.com/iputils/iputils" | ||
5 | SECTION = "console/network" | ||
6 | |||
7 | LICENSE = "BSD & GPLv2+" | ||
8 | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390" | ||
10 | |||
11 | DEPENDS = "gnutls" | ||
12 | |||
13 | SRC_URI = "git://github.com/iputils/iputils \ | ||
14 | file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ | ||
15 | file://0001-ninfod-fix-systemd-Documentation-url-error.patch \ | ||
16 | file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ | ||
17 | file://0001-iputils-Initialize-libgcrypt.patch \ | ||
18 | " | ||
19 | SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" | ||
24 | |||
25 | # Fixed in 2000-10-10, but the versioning of iputils | ||
26 | # breaks the version order. | ||
27 | CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" | ||
28 | |||
29 | PACKAGECONFIG ??= "libcap libgcrypt rarpd \ | ||
30 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ | ||
31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
32 | PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" | ||
33 | PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" | ||
34 | PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" | ||
35 | PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" | ||
36 | PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," | ||
37 | PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," | ||
38 | PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" | ||
39 | PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," | ||
40 | PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" | ||
41 | |||
42 | inherit meson systemd update-alternatives | ||
43 | |||
44 | # Have to disable setcap/suid as its not deterministic | ||
45 | EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" | ||
46 | |||
47 | ALTERNATIVE_PRIORITY = "100" | ||
48 | |||
49 | ALTERNATIVE_${PN}-ping = "ping" | ||
50 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | ||
51 | |||
52 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ | ||
53 | ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ | ||
54 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" | ||
55 | PACKAGES += "${SPLITPKGS}" | ||
56 | |||
57 | ALLOW_EMPTY_${PN} = "1" | ||
58 | RDEPENDS_${PN} += "${SPLITPKGS}" | ||
59 | |||
60 | FILES_${PN} = "" | ||
61 | FILES_${PN}-ping = "${base_bindir}/ping.${BPN}" | ||
62 | FILES_${PN}-arping = "${base_bindir}/arping" | ||
63 | FILES_${PN}-tracepath = "${base_bindir}/tracepath" | ||
64 | FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" | ||
65 | FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" | ||
66 | FILES_${PN}-tftpd = "${base_bindir}/tftpd" | ||
67 | FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" | ||
68 | FILES_${PN}-rdisc = "${base_sbindir}/rdisc" | ||
69 | FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" | ||
70 | |||
71 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ | ||
72 | ${PN}-rdisc" | ||
73 | SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" | ||
74 | SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" | ||