diff options
Diffstat (limited to 'meta/recipes-extended/iputils/iputils_s20190709.bb')
-rw-r--r-- | meta/recipes-extended/iputils/iputils_s20190709.bb | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb index e0d2ae160e..2aed6b56ca 100644 --- a/meta/recipes-extended/iputils/iputils_s20190709.bb +++ b/meta/recipes-extended/iputils/iputils_s20190709.bb | |||
@@ -12,6 +12,8 @@ DEPENDS = "gnutls" | |||
12 | 12 | ||
13 | SRC_URI = "git://github.com/iputils/iputils \ | 13 | SRC_URI = "git://github.com/iputils/iputils \ |
14 | file://0001-ninfod-change-variable-name-to-avoid-colliding-with-.patch \ | 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 \ | ||
15 | " | 17 | " |
16 | SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" | 18 | SRCREV = "13e00847176aa23683d68fce1d17ffb523510946" |
17 | 19 | ||
@@ -23,16 +25,20 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" | |||
23 | # breaks the version order. | 25 | # breaks the version order. |
24 | CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" | 26 | CVE_CHECK_WHITELIST += "CVE-2000-1213 CVE-2000-1214" |
25 | 27 | ||
26 | PACKAGECONFIG ??= "libcap libgcrypt rarpd traceroute6" | 28 | PACKAGECONFIG ??= "libcap libgcrypt rarpd \ |
29 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ninfod traceroute6', '', d)} \ | ||
30 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | ||
27 | PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" | 31 | PACKAGECONFIG[libcap] = "-DUSE_CAP=true, -DUSE_CAP=false, libcap" |
28 | PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" | 32 | PACKAGECONFIG[libgcrypt] = "-DUSE_CRYPTO=gcrypt, -DUSE_CRYPTO=none, libgcrypt" |
29 | PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" | 33 | PACKAGECONFIG[libidn] = "-DUSE_IDN=true, -DUSE_IDN=false, libidn2" |
30 | PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" | 34 | PACKAGECONFIG[gettext] = "-DUSE_GETTEXT=true, -DUSE_GETTEXT=false, gettext" |
35 | PACKAGECONFIG[ninfod] = "-DBUILD_NINFOD=true,-DBUILD_NINFOD=false," | ||
31 | PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," | 36 | PACKAGECONFIG[rarpd] = "-DBUILD_RARPD=true,-DBUILD_RARPD=false," |
37 | PACKAGECONFIG[systemd] = "-Dsystemdunitdir=${systemd_unitdir}/system,,systemd" | ||
32 | PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," | 38 | PACKAGECONFIG[traceroute6] = "-DBUILD_TRACEROUTE6=true,-DBUILD_TRACEROUTE6=false," |
33 | PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" | 39 | PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MANS=false -DBUILD_MANS=false, libxslt" |
34 | 40 | ||
35 | inherit meson update-alternatives | 41 | inherit meson systemd update-alternatives |
36 | 42 | ||
37 | # Have to disable setcap/suid as its not deterministic | 43 | # Have to disable setcap/suid as its not deterministic |
38 | EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" | 44 | EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true" |
@@ -42,12 +48,12 @@ ALTERNATIVE_PRIORITY = "100" | |||
42 | ALTERNATIVE_${PN}-ping = "ping" | 48 | ALTERNATIVE_${PN}-ping = "ping" |
43 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" | 49 | ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" |
44 | 50 | ||
45 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-traceroute6 ${PN}-clockdiff ${PN}-tftpd ${PN}-rarpd ${PN}-rdisc ${PN}-ninfod" | 51 | SPLITPKGS = "${PN}-ping ${PN}-arping ${PN}-tracepath ${PN}-clockdiff ${PN}-tftpd ${PN}-rdisc \ |
52 | ${@bb.utils.contains('PACKAGECONFIG', 'rarpd', '${PN}-rarpd', '', d)} \ | ||
53 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-traceroute6 ${PN}-ninfod', '', d)}" | ||
46 | PACKAGES += "${SPLITPKGS}" | 54 | PACKAGES += "${SPLITPKGS}" |
47 | 55 | ||
48 | ALLOW_EMPTY_${PN} = "1" | 56 | ALLOW_EMPTY_${PN} = "1" |
49 | ALLOW_EMPTY_${PN}-rarpd = "1" | ||
50 | ALLOW_EMPTY_${PN}-traceroute6 = "1" | ||
51 | RDEPENDS_${PN} += "${SPLITPKGS}" | 57 | RDEPENDS_${PN} += "${SPLITPKGS}" |
52 | 58 | ||
53 | FILES_${PN} = "" | 59 | FILES_${PN} = "" |
@@ -57,6 +63,11 @@ FILES_${PN}-tracepath = "${base_bindir}/tracepath" | |||
57 | FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" | 63 | FILES_${PN}-traceroute6 = "${base_bindir}/traceroute6" |
58 | FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" | 64 | FILES_${PN}-clockdiff = "${base_bindir}/clockdiff" |
59 | FILES_${PN}-tftpd = "${base_bindir}/tftpd" | 65 | FILES_${PN}-tftpd = "${base_bindir}/tftpd" |
60 | FILES_${PN}-rarpd = "${base_sbindir}/rarpd" | 66 | FILES_${PN}-rarpd = "${base_sbindir}/rarpd ${systemd_unitdir}/system/rarpd@.service" |
61 | FILES_${PN}-rdisc = "${base_sbindir}/rdisc" | 67 | FILES_${PN}-rdisc = "${base_sbindir}/rdisc" |
62 | FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" | 68 | FILES_${PN}-ninfod = "${base_sbindir}/ninfod ${sysconfdir}/init.d/ninfod.sh" |
69 | |||
70 | SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '${PN}-ninfod', '', d)} \ | ||
71 | ${PN}-rdisc" | ||
72 | SYSTEMD_SERVICE_${PN}-ninfod = "ninfod.service" | ||
73 | SYSTEMD_SERVICE_${PN}-rdisc = "rdisc.service" | ||