diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2013-03-07 15:04:10 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-03-12 11:22:40 +0100 |
commit | f44c52cbae96c81a20fa91d528eb0bbc5abaec06 (patch) | |
tree | bd377a6a45a77f6ffe2a2b7c7664e0820dd4838b | |
parent | 788b3410a7fef7121db3067f2a6813944153f63c (diff) | |
download | meta-openembedded-f44c52cbae96c81a20fa91d528eb0bbc5abaec06.tar.gz |
samba: fix install for older samba versions
* Samba 3.0 doesn't build libnss_*.so
* base_sbindir may contain mount.cifs
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/samba/samba.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc index 3ee43ad1c..42ddce5a1 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc | |||
@@ -87,10 +87,12 @@ do_install_append() { | |||
87 | install -d ${D}/var/spool/samba | 87 | install -d ${D}/var/spool/samba |
88 | 88 | ||
89 | # Install other stuff not installed by "make install" | 89 | # Install other stuff not installed by "make install" |
90 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 | 90 | if [ -d ${WORKDIR}/${PN}-${PV}/nsswitch ]; then |
91 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 | 91 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 |
92 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 | ||
93 | fi | ||
92 | 94 | ||
93 | rmdir ${D}${base_sbindir} | 95 | rmdir --ignore-fail-on-non-empty ${D}${base_sbindir} |
94 | sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb | 96 | sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb |
95 | } | 97 | } |
96 | 98 | ||