[oe-commits] Ting Liu : samba: Fix build on Fedora 17

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: danny-next
Commit: a4eac0d18323b405002c53c289a13ef2afe610ed
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=a4eac0d18323b405002c53c289a13ef2afe610ed

Author: Ting Liu <b28495 at freescale.com>
Date:   Fri Dec 14 08:19:41 2012 +0000

samba: Fix build on Fedora 17

* Fedora 17 has /bin/perl, this causes samba build to put perl interpreter
  path as /bin/perl But we set perl location for target as /usr/bin/perl

* This mismatch of perl path causes failure of rootfs image creation:
  | error: Failed dependencies:
  | 	/bin/perl is needed by samba-3.6.8-r3.ppce5500

* MJ: fixed whitespaces

Signed-off-by: Ting Liu <b28495 at freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-connectivity/samba/samba.inc      |    7 ++++---
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index d39a84a..416334a 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -84,11 +84,12 @@ do_install_append() {
 	install -d ${D}/var/log/samba
 	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
+	# 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
 
 	rmdir ${D}${base_sbindir}
+	sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
 }
 
 
diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 4750ecb..5722cb6 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "\
     file://config-h.patch \