[oe] [meta-networking][PATCH] mdns: Mark as incompatible with musl

[Khem Raj]

On Tue, Oct 29, 2019 at 10:07 AM Adrian Bunk <bunk at stusta.de> wrote:
>
> musl does not support mDNS or NSS plugins.
>
> Signed-off-by: Adrian Bunk <bunk at stusta.de>
> ---
>  ...Do-not-include-nss.h-when-libc-glibc.patch | 42 -------------------
>  .../recipes-protocols/mdns/mdns_878.200.35.bb |  3 +-
>  2 files changed, 2 insertions(+), 43 deletions(-)
>  delete mode 100644 meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
>
> diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
> deleted file mode 100644
> index 863866d18..000000000
> --- a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem at gmail.com>
> -Date: Fri, 2 Feb 2018 21:54:11 -0800
> -Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc
> -
> -Provide nss_status macro instead for non-glibc case
> -where nss.h is absent
> -
> -Upstream-Status: Pending
> -Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ----
> - mDNSPosix/nss_mdns.c | 13 ++++++++++++-
> - 1 file changed, 12 insertions(+), 1 deletion(-)
> -
> -diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c
> -index afadb3c..c469584 100755
> ---- a/mDNSPosix/nss_mdns.c
> -+++ b/mDNSPosix/nss_mdns.c
> -@@ -378,8 +378,19 @@ init_config ();
> -
> - #define ENTNAME  hostent
> - #define DATABASE "hosts"
> --
> -+#ifdef __GLIBC__
> - #include <nss.h>
> -+#else
> -+enum nss_status
> -+{
> -+    NSS_STATUS_TRYAGAIN = -2,
> -+    NSS_STATUS_UNAVAIL,
> -+    NSS_STATUS_NOTFOUND,
> -+    NSS_STATUS_SUCCESS,
> -+    NSS_STATUS_RETURN
> -+};
> -+#define NETDB_INTERNAL NULL
> -+#endif
> - // For nss_status
> - #include <netdb.h>
> - // For hostent
> ---
> -2.16.1
> -
> diff --git a/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb b/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb
> index 1bd17031a..1353b2bed 100644
> --- a/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb
> +++ b/meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb
> @@ -4,12 +4,13 @@ HOMEPAGE = "http://developer.apple.com/networking/bonjour/"
>  LICENSE = "Apache-2.0"
>  LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf"
>
> +COMPATIBLE_HOST_libc-musl = 'null'
> +

this is fine but please adjust
meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb
accordingly as well.

secondly, ntp also has a packageconfig for mdns its disabled by
default so not a big problem, but it will be good to error out if user
enabled it when using musl.

>  RPROVIDES_${PN} += "libdns_sd.so"
>
>  SRC_URI = "https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \
>             file://build.patch;patchdir=.. \
>             file://mdns.service \
> -           file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \
>             "
>  SRC_URI[md5sum] = "e773f290a7d29f1072247985d6add2ff"
>  SRC_URI[sha256sum] = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel