diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-networking/recipes-support/nis')
5 files changed, 39 insertions, 5 deletions
diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc index c4aa10e3a..e027a1c6f 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/nis.inc @@ -25,7 +25,7 @@ do_install() { # so force the package to be skipped here (this will cause a # 'nothing provides' error) python () { - os = bb.data.getVar("TARGET_OS", d, 1) + os = d.getVar("TARGET_OS", True) if os == "linux-uclibc": raise bb.parse.SkipPackage("NIS functionality requires rpcsvc/yp.h, uClibC does not provide this") } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch new file mode 100644 index 000000000..d1d5f9ca7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch @@ -0,0 +1,33 @@ +From 71fdfdfcea2bfa5f522512366bfcdf95f861ecc6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 23 Apr 2017 23:44:37 -0700 +Subject: [PATCH] lib/yp_all_host.c: Fix build with gcc 7 + +fixes + +| ../../../../../../../workspace/sources/yp-tools/lib/yp_all_host.c: In function 'yp_all_host': +| ../../../../../../../workspace/sources/yp-tools/lib/yp_all_host.c:109:30: error: comparison between pointer and zero character constant [-Werror=pointer-compare] +| inmap == NULL || inmap == '\0') +| ^~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/yp_all_host.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/yp_all_host.c b/lib/yp_all_host.c +index 59cf236..4a07a7e 100644 +--- a/lib/yp_all_host.c ++++ b/lib/yp_all_host.c +@@ -106,7 +106,7 @@ yp_all_host (const char *indomain, const char *inmap, + + if (hostname == NULL || hostname[0] == '\0' || + indomain == NULL || indomain[0] == '\0' || +- inmap == NULL || inmap == '\0') ++ inmap == NULL || inmap[0] == '\0') + return YPERR_BADARGS; + + res = YPERR_YPERR; +-- +2.12.2 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb index 69217fad1..7bd4630f7 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb @@ -15,7 +15,8 @@ SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ file://domainname.service \ file://yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch \ file://alignment-cheat.patch \ -" + file://0001-lib-yp_all_host.c-Fix-build-with-gcc-7.patch \ + " SRC_URI[md5sum] = "acebeecc11a73fb8097503670344834c" SRC_URI[sha256sum] = "812be817df3d4c25813552be336c6c6ad5aedaf65611b81af3ad9f98fb3c2e50" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb index 9fc6406b7..b9c0aa700 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb @@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" DEPENDS = " \ yp-tools \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " RDEPENDS_${PN} += "yp-tools" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb index 82544e759..0b7e5046b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb @@ -15,10 +15,10 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first. \ " HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" -DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS = "yp-tools ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PROVIDES += "ypbind" -PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools" +PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools - the recipe will be removed on 2017-09-01 unless the issue is fixed" SRC_URI = "http://www.linux-nis.org/download/ypbind-mt/${BP}.tar.bz2 \ file://ypbind.init \ |
