Skip to contentSkip to conversation

mdns: Mark as incompatible with musl

PATCH In review Adrian Bunk 2 participants 5 messages Oct 29, 2019 – Oct 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mdns: Mark as incompatible with musl

musl does not support mDNS or NSS plugins.

---
 ...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
meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch deleted +0 -42
deleted file mode 100644
index 863866d18..000000000
@@ -1,42 +0,0 @@
-From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +2 -1
index 1bd17031a..1353b2bed 100644
@@ -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'
+
 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"
Signature · 1 line
2.17.1
#1 lore raw
Quoted 63 lines · Adrian Bunk

musl does not support mDNS or NSS plugins.

---
 ...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
meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch deleted +0 -42
deleted file mode 100644
index 863866d18..000000000
@@ -1,42 +0,0 @@
-From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-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 <[email protected]>
----
- 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
-
meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +0 -0
index 1bd17031a..1353b2bed 100644

meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb HOMEPAGE = "http://developer.apple.com/networking/bonjour/" · line 8

Quoted 5 lines
meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +2 -0
@@ -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.

Quoted 17 lines
meta-networking/recipes-protocols/mdns/mdns_878.200.35.bb +0 -2
 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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 4 lines · Khem Raj

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

I already considered this, but when I tried building this packagegroup for musl it failed on some netkit recipes even without my change.

Quoted 3 lines

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.

ERROR: Nothing PROVIDES 'mdns' (but /home/bunk/yoctomaster/yocto-test/sources/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb DEPENDS on or otherwise requires it) mdns was skipped: incompatible with host aarch64-test-linux-musl (not in COMPATIBLE_HOST)
ERROR: Required build target 'ntp' has no buildable providers.
Missing or unbuildable dependency chain was: ['ntp', 'mdns']

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw
Quoted 10 lines · Adrian Bunk
Quoted 4 lines · Khem Raj

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

I already considered this, but when I tried building this packagegroup for musl it failed on some netkit recipes even without my change.

thats fine but please do remove these recipes via _remove-libc-musl regardless

Quoted 9 lines
Quoted 3 lines

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.

ERROR: Nothing PROVIDES 'mdns' (but /home/bunk/yoctomaster/yocto-test/sources/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p13.bb DEPENDS on or otherwise requires it) mdns was skipped: incompatible with host aarch64-test-linux-musl (not in COMPATIBLE_HOST)
ERROR: Required build target 'ntp' has no buildable providers.
Missing or unbuildable dependency chain was: ['ntp', 'mdns']

thats good then

Quoted 10 lines

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed

#4 lore raw
Quoted 8 lines · Khem Raj
Quoted 7 lines · Adrian Bunk
Quoted 4 lines · Khem Raj

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

Quoted 6 lines
Quoted 3 lines

I already considered this, but when I tried building this packagegroup for musl it failed on some netkit recipes even without my change.

thats fine but please do remove these recipes via _remove-libc-musl regardless
...

Patch sent for both mdns and all the existing cases.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed