samba: fix install for older samba versions

* Samba 3.0 doesn't build libnss_*.so
* base_sbindir may contain mount.cifs

(From meta-openembedded rev: f44c52cbae96c81a20fa91d528eb0bbc5abaec06)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc b/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc
index 3ee43ad..42ddce5 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-openembedded/meta-oe/recipes-connectivity/samba/samba.inc
@@ -87,10 +87,12 @@ do_install_append() {
        install -d ${D}/var/spool/samba
 
        # Install other stuff not installed by "make install"
-       install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
-       install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
+       if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then
+               install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2
+               install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2
+       fi
 
-       rmdir ${D}${base_sbindir}
+       rmdir --ignore-fail-on-non-empty ${D}${base_sbindir}
        sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
 }