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

[Andreas Oberritter]

On 07.03.2013 14:48, Martin Jansa wrote:
> 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.

Yes, that's what I thought, so I chose to keep it unchanged.

>> -	rmdir ${D}${base_sbindir}
>> +	rmdir ${D}${base_sbindir} || true
> 
> Maybe use
>               --ignore-fail-on-non-empty
> 
> instead of || true.

Thanks, I will send v2 shortly.

Regards,
Andreas