[oe] [meta-oe][PATCH] samba: fix install for older samba versions

[Martin Jansa]

On Thu, Mar 07, 2013 at 02:14:56PM +0100, Andreas Oberritter wrote:
> * Samba 3.0 doesn't build libbss_*.so

libnss_*.so

> * base_sbindir may contain mount.cifs
> 
> Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
> ---
>  meta-oe/recipes-connectivity/samba/samba.inc |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index 3ee43ad..a151b16 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/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

It looks weird, but ${S}/../nsswitch won't be much better I guess.

> -	rmdir ${D}${base_sbindir}
> +	rmdir ${D}${base_sbindir} || true

Maybe use
              --ignore-fail-on-non-empty

instead of || true.

>  	sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
>  }
>  
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130307/187c52c5/attachment-0002.sig>