Be explicit about where we're taking the installation pieces from rather than having the complexity of mixed build/source pieces based on current directory and then confusing anyone who tries to append to do_install.
Signed-off-by: Alex Kiernan <[email protected]> --- .../mdns/mdns_2881.100.56.0.1.bb | 44 ++++++++----------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb b/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb index 3950ee666fc4..391c4898fb47 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_2881.100.56.0.1.bb @@ -66,42 +66,36 @@ TARGET_CC_ARCH += "${LDFLAGS}" MDNS_BUILDDIR = "build/${@bb.utils.contains('PACKAGECONFIG','debug','debug','prod', d)}" do_install () { - cd mDNSPosix - + install -d ${D}${bindir} + install -d ${D}${includedir} + install -d ${D}${libdir} + install -d ${D}${mandir}/man5 + install -d ${D}${mandir}/man8 install -d ${D}${sbindir} - install ${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} + install -d ${D}${sysconfdir} + install -d ${D}${systemd_system_unitdir} + install -d ${D}${INIT_D_DIR} - install -d ${D}${libdir} - install -m 0644 ${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 - ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so + install ${B}/mDNSPosix/${MDNS_BUILDDIR}/mdnsd ${D}${sbindir} - install -d ${D}${includedir} - install -m 0644 ../mDNSShared/dns_sd.h ${D}${includedir} + install -m 0644 ${B}/mDNSPosix/${MDNS_BUILDDIR}/libdns_sd.so ${D}${libdir}/libdns_sd.so.1 + ln -s libdns_sd.so.1 ${D}${libdir}/libdns_sd.so - install -d ${D}${mandir}/man8 - install -m 0644 ../mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 + install -m 0644 ${B}/mDNSShared/dns_sd.h ${D}${includedir} + install -m 0644 ${B}/mDNSShared/mDNSResponder.8 ${D}${mandir}/man8/mdnsd.8 - install -d ${D}${bindir} - install -m 0755 ../Clients/build/dns-sd ${D}${bindir} + install -m 0755 ${B}/Clients/build/dns-sd ${D}${bindir} - install -d ${D}${libdir} - oe_libinstall -C ${MDNS_BUILDDIR} -so libnss_mdns-0.2 ${D}${libdir} + oe_libinstall -C ${B}/mDNSPosix/${MDNS_BUILDDIR} -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 -m 0644 ${B}/mDNSPosix/nss_mdns.conf ${D}${sysconfdir} + install -m 0644 ${B}/mDNSPosix/nss_mdns.conf.5 ${D}${mandir}/man5 + install -m 0644 ${B}/mDNSPosix/libnss_mdns.8 ${D}${mandir}/man8 - 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_system_unitdir} install -m 0644 ${UNPACKDIR}/mdns.service ${D}${systemd_system_unitdir} - install -d ${D}${INIT_D_DIR} - install mdnsd.sh ${D}${INIT_D_DIR}/mdns + install ${B}/mDNSPosix/mdnsd.sh ${D}${INIT_D_DIR}/mdns } pkg_postinst:${PN}-libnss-mdns () {
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#127367): https://lists.openembedded.org/g/openembedded-devel/message/127367 Mute This Topic: https://lists.openembedded.org/mt/119613419/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
