mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 19:47:17 +00:00
mdns: move from meta-intel-iot-middleware
The following improvements have been made over the recipe that was in meta-intel-iot-middleware (a layer which is no longer actively maintained): * Upgrade to latest upstream version (765.50.9) * Fix compilation failures by passing CC and LD * Fix "no GNU hash in the ELF binary" issue * Point S at the correct source subdirectory so that "make clean" works * Fix lack of soname on libdns_sd.so leading to missing RDEPENDS QA error * Add SUMMARY Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Paul Eggleton
committed by
Joe MacDonald
Joe MacDonald
parent
545221b5ab
commit
b5281a99c7
@@ -0,0 +1,167 @@
|
|||||||
|
From 43b6e98c9c37afd0d914949dcff4eab81f5a995f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Brendan Le Foll <brendan.le.foll@intel.com>
|
||||||
|
Date: Tue, 3 Mar 2015 11:42:57 +0000
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE-specific]
|
||||||
|
|
||||||
|
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
mDNSPosix/Makefile | 54 +++++++++++++++++++++++++-----------------------------
|
||||||
|
1 file changed, 25 insertions(+), 29 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/mDNSPosix/Makefile b/mDNSPosix/Makefile
|
||||||
|
index 4f98e90..8ac97ad 100755
|
||||||
|
--- a/mDNSPosix/Makefile
|
||||||
|
+++ b/mDNSPosix/Makefile
|
||||||
|
@@ -50,6 +50,7 @@
|
||||||
|
|
||||||
|
LIBVERS = 1
|
||||||
|
|
||||||
|
+POSIXDIR = ../mDNSPosix
|
||||||
|
COREDIR = ../mDNSCore
|
||||||
|
SHAREDDIR ?= ../mDNSShared
|
||||||
|
JDK = /usr/jdk
|
||||||
|
@@ -58,11 +59,11 @@ CC = @cc
|
||||||
|
BISON = @bison
|
||||||
|
FLEX = @flex
|
||||||
|
ST = @strip
|
||||||
|
-LD = ld -shared
|
||||||
|
+LD =@LD
|
||||||
|
CP = cp
|
||||||
|
RM = rm
|
||||||
|
LN = ln -s -f
|
||||||
|
-CFLAGS_COMMON = -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
|
||||||
|
+CFLAGS_COMMON = -I$(POSIXDIR) -I$(COREDIR) -I$(SHAREDDIR) -I$(OBJDIR) -fwrapv -W -Wall -DPID_FILE=\"/var/run/mdnsd.pid\" -DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd\"
|
||||||
|
CFLAGS_PTHREAD =
|
||||||
|
LINKOPTS =
|
||||||
|
LINKOPTS_PTHREAD = -lpthread
|
||||||
|
@@ -70,7 +71,7 @@ LDSUFFIX = so
|
||||||
|
JAVACFLAGS_OS = -fPIC -shared -ldns_sd
|
||||||
|
|
||||||
|
# Set up diverging paths for debug vs. prod builds
|
||||||
|
-DEBUG=0
|
||||||
|
+DEBUG?=1
|
||||||
|
ifeq ($(DEBUG),1)
|
||||||
|
CFLAGS_DEBUG = -g -DMDNS_DEBUGMSGS=2
|
||||||
|
OBJDIR = objects/debug
|
||||||
|
@@ -213,7 +214,7 @@ endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
|
||||||
|
+CFLAGS_BUILD = $(CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_OS) $(CFLAGS_DEBUG)
|
||||||
|
|
||||||
|
#############################################################################
|
||||||
|
|
||||||
|
@@ -249,8 +250,7 @@ Daemon: setup $(BUILDDIR)/mdnsd
|
||||||
|
@echo "Responder daemon done"
|
||||||
|
|
||||||
|
$(BUILDDIR)/mdnsd: $(DAEMONOBJS)
|
||||||
|
- $(CC) -o $@ $+ $(LINKOPTS)
|
||||||
|
- @$(STRIP) $@
|
||||||
|
+ $(CC) -o $@ $+
|
||||||
|
|
||||||
|
# libdns_sd target builds the client library
|
||||||
|
libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
|
||||||
|
@@ -259,22 +259,18 @@ libdns_sd: setup $(BUILDDIR)/libdns_sd.$(LDSUFFIX)
|
||||||
|
CLIENTLIBOBJS = $(OBJDIR)/dnssd_clientlib.c.so.o $(OBJDIR)/dnssd_clientstub.c.so.o $(OBJDIR)/dnssd_ipc.c.so.o
|
||||||
|
|
||||||
|
$(BUILDDIR)/libdns_sd.$(LDSUFFIX): $(CLIENTLIBOBJS)
|
||||||
|
- @$(LD) $(LINKOPTS) -o $@ $+
|
||||||
|
- @$(STRIP) $@
|
||||||
|
+ $(LD) -shared $(LINKOPTS) -Wl,-soname,libdns_sd.$(LDSUFFIX).1 -o $@ $+
|
||||||
|
|
||||||
|
-Clients: setup libdns_sd ../Clients/build/dns-sd
|
||||||
|
+Clients: setup libdns_sd
|
||||||
|
+ @$(MAKE) -C ../Clients DEBUG=${DEBUG}
|
||||||
|
@echo "Clients done"
|
||||||
|
|
||||||
|
-../Clients/build/dns-sd:
|
||||||
|
- @$(MAKE) -C ../Clients
|
||||||
|
-
|
||||||
|
# nss_mdns target builds the Name Service Switch module
|
||||||
|
nss_mdns: setup $(BUILDDIR)/$(NSSLIBFILE)
|
||||||
|
@echo "Name Service Switch module done"
|
||||||
|
|
||||||
|
$(BUILDDIR)/$(NSSLIBFILE): $(CLIENTLIBOBJS) $(OBJDIR)/nss_mdns.c.so.o
|
||||||
|
- @$(LD) $(LINKOPTS) -o $@ $+
|
||||||
|
- @$(STRIP) $@
|
||||||
|
+ $(LD) -shared $(LINKOPTS) -o $@ $+
|
||||||
|
|
||||||
|
#############################################################################
|
||||||
|
|
||||||
|
@@ -470,55 +466,55 @@ dnsextd: setup $(BUILDDIR)/dnsextd
|
||||||
|
@echo "dnsextd done"
|
||||||
|
|
||||||
|
$(BUILDDIR)/mDNSClientPosix: $(APPOBJ) $(OBJDIR)/Client.c.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS)
|
||||||
|
+ $(CC) $+ -o $@
|
||||||
|
|
||||||
|
$(BUILDDIR)/mDNSResponderPosix: $(COMMONOBJ) $(OBJDIR)/Responder.c.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS)
|
||||||
|
+ $(CC) $+ -o $@
|
||||||
|
|
||||||
|
$(BUILDDIR)/mDNSProxyResponderPosix: $(COMMONOBJ) $(OBJDIR)/ProxyResponder.c.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS)
|
||||||
|
+ $(CC) $+ -o $@
|
||||||
|
|
||||||
|
$(BUILDDIR)/mDNSIdentify: $(SPECIALOBJ) $(OBJDIR)/Identify.c.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS)
|
||||||
|
+ $(CC) $+ -o $@
|
||||||
|
|
||||||
|
$(OBJDIR)/Identify.c.o: $(COREDIR)/mDNS.c # Note: Identify.c textually imports mDNS.c
|
||||||
|
|
||||||
|
$(BUILDDIR)/mDNSNetMonitor: $(SPECIALOBJ) $(OBJDIR)/NetMonitor.c.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS)
|
||||||
|
+ $(CC) $+ -o $@
|
||||||
|
|
||||||
|
$(OBJDIR)/NetMonitor.c.o: $(COREDIR)/mDNS.c # Note: NetMonitor.c textually imports mDNS.c
|
||||||
|
|
||||||
|
$(BUILDDIR)/dnsextd: $(DNSEXTDOBJ) $(OBJDIR)/dnsextd.c.threadsafe.o
|
||||||
|
- $(CC) $+ -o $@ $(LINKOPTS) $(LINKOPTS_PTHREAD)
|
||||||
|
+ $(CC) $+ -o $@ $(LINKOPTS_PTHREAD)
|
||||||
|
|
||||||
|
#############################################################################
|
||||||
|
|
||||||
|
# Implicit rules
|
||||||
|
$(OBJDIR)/%.c.o: %.c
|
||||||
|
- $(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.o: $(COREDIR)/%.c
|
||||||
|
- $(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.o: $(SHAREDDIR)/%.c
|
||||||
|
- $(CC) $(CFLAGS) -c -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.threadsafe.o: %.c
|
||||||
|
- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.threadsafe.o: $(SHAREDDIR)/%.c
|
||||||
|
- $(CC) $(CFLAGS) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) $(CFLAGS_PTHREAD) -D_REENTRANT -c -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.so.o: %.c
|
||||||
|
- $(CC) $(CFLAGS) -c -fPIC -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.c.so.o: $(SHAREDDIR)/%.c
|
||||||
|
- $(CC) $(CFLAGS) -c -fPIC -o $@ $<
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -fPIC -o $@ $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.y.o: $(SHAREDDIR)/%.y
|
||||||
|
$(BISON) -o $(OBJDIR)/$*.c -d $<
|
||||||
|
- $(CC) $(CFLAGS) -c -o $@ $(OBJDIR)/$*.c
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -c -o $@ $(OBJDIR)/$*.c
|
||||||
|
|
||||||
|
$(OBJDIR)/%.l.o: $(SHAREDDIR)/%.l
|
||||||
|
$(FLEX) $(FLEXFLAGS_OS) -i -o$(OBJDIR)/$*.l.c $<
|
||||||
|
- $(CC) $(CFLAGS) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c
|
||||||
|
+ $(CC) $(CFLAGS_BUILD) -Wno-error -c -o $@ $(OBJDIR)/$*.l.c
|
||||||
|
--
|
||||||
|
2.9.5
|
||||||
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Zero-configuration networking
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=forking
|
||||||
|
ExecStartPre=/bin/rm -f /var/run/mdnsd.pid
|
||||||
|
ExecStart=/usr/sbin/mdnsd
|
||||||
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
|
PIDFile=/var/run/mdnsd.pid
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10s
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
SUMMARY = "Publishes & browses available services on a link according to the Zeroconf / Bonjour protocol"
|
||||||
|
DESCRIPTION = "Bonjour, also known as zero-configuration networking, enables automatic discovery of computers, devices, and services on IP networks."
|
||||||
|
HOMEPAGE = "http://developer.apple.com/networking/bonjour/"
|
||||||
|
LICENSE = "Apache-2.0"
|
||||||
|
LIC_FILES_CHKSUM = "file://../LICENSE;md5=31c50371921e0fb731003bbc665f29bf"
|
||||||
|
|
||||||
|
RPROVIDES_${PN} += "libdns_sd.so"
|
||||||
|
|
||||||
|
SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \
|
||||||
|
file://build.patch;patchdir=.. \
|
||||||
|
file://mdns.service \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317"
|
||||||
|
SRC_URI[sha256sum] = "de61dd0034357aa50c60806726fb1f70fa8e953ff9cb62eccfb73efad10dba0a"
|
||||||
|
|
||||||
|
PARALLEL_MAKE = ""
|
||||||
|
|
||||||
|
S = "${WORKDIR}/mDNSResponder-${PV}/mDNSPosix"
|
||||||
|
|
||||||
|
EXTRA_OEMAKE += "os=linux DEBUG=0 'CC=${CC}' 'LD=${CCLD} ${LDFLAGS}'"
|
||||||
|
|
||||||
|
TARGET_CC_ARCH += "${LDFLAGS}"
|
||||||
|
|
||||||
|
do_install () {
|
||||||
|
install -d ${D}${sbindir}
|
||||||
|
install -m 0755 build/prod/mdnsd ${D}${sbindir}
|
||||||
|
|
||||||
|
install -d ${D}${libdir}
|
||||||
|
cp build/prod/libdns_sd.so ${D}${libdir}/libdns_sd.so.1
|
||||||
|
chmod 0644 ${D}${libdir}/libdns_sd.so.1
|
||||||
|
ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so
|
||||||
|
|
||||||
|
install -d ${D}${includedir}
|
||||||
|
install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir}
|
||||||
|
|
||||||
|
install -d ${D}${mandir}/man8
|
||||||
|
install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8
|
||||||
|
|
||||||
|
install -d ${D}${bindir}
|
||||||
|
install -m 0755 ../Clients/build/dns-sd ${D}${bindir}
|
||||||
|
|
||||||
|
install -d ${D}${libdir}
|
||||||
|
oe_libinstall -C build/prod -so libnss_mdns-0.2 ${D}${libdir}
|
||||||
|
ln -s libnss_mdns-0.2.so ${D}${libdir}/libnss_mdns.so.2
|
||||||
|
|
||||||
|
install -d ${D}${sysconfdir}
|
||||||
|
install -m 0644 nss_mdns.conf ${D}${sysconfdir}
|
||||||
|
|
||||||
|
install -d ${D}${mandir}/man5
|
||||||
|
install -m 0644 nss_mdns.conf.5 ${D}${mandir}/man5
|
||||||
|
|
||||||
|
install -d ${D}${mandir}/man8
|
||||||
|
install -m 0644 libnss_mdns.8 ${D}${mandir}/man8
|
||||||
|
|
||||||
|
install -d ${D}${systemd_unitdir}/system/
|
||||||
|
install -m 0644 ${WORKDIR}/mdns.service ${D}${systemd_unitdir}/system/
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst_${PN} () {
|
||||||
|
sed -e '/^hosts:/s/\s*\<mdns\>//' \
|
||||||
|
-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 mdns\3\4\5/' \
|
||||||
|
-i $D/etc/nsswitch.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_prerm_${PN} () {
|
||||||
|
sed -e '/^hosts:/s/\s*\<mdns\>//' \
|
||||||
|
-e '/^hosts:/s/\s*mdns//' \
|
||||||
|
-i $D/etc/nsswitch.conf
|
||||||
|
}
|
||||||
|
|
||||||
|
inherit systemd
|
||||||
|
|
||||||
|
SYSTEMD_SERVICE_${PN} = "mdns.service"
|
||||||
|
|
||||||
|
FILES_${PN} += "${systemd_unitdir}/system/mdns.service"
|
||||||
|
FILES_${PN} += "${libdir}/libdns_sd.so.1 \
|
||||||
|
${bindir}/dns-sd \
|
||||||
|
${libdir}/libnss_mdns-0.2.so \
|
||||||
|
${sysconfdir}/nss_mdns.conf"
|
||||||
|
|
||||||
|
FILES_${PN}-dev += "${libdir}/libdns_sd.so \
|
||||||
|
${includedir}/dns_sd.h "
|
||||||
|
|
||||||
|
FILES_${PN}-man += "${mandir}/man8/mdnsd.8 \
|
||||||
|
${mandir}/man5/nss_mdns.conf.5 \
|
||||||
|
${mandir}/man8/libnss_mdns.8"
|
||||||
|
|
||||||
|
PACKAGES = "${PN} ${PN}-dev ${PN}-man ${PN}-dbg"
|
||||||
Reference in New Issue
Block a user