Skip to contentSkip to conversation

samba: Fix build on Fedora 17

meta-oe [email protected] 2 participants 2 messages Nov 23, 2012 – Nov 27, 2012

lore
Share & tools
lore
#0 lore raw

From: Ting Liu <[email protected]>

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-r1.ppce5500

---
 meta-oe/recipes-connectivity/samba/samba.inc      | 2 ++
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/samba/samba.inc +2 -0
index faa2be0..c4430d1 100644
@@ -88,6 +88,8 @@ do_install_append() {
         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
 
+        sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
+
 }
 
 
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +1 -1
index cc09a48..7c54dae 100644
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "\
     file://config-h.patch \
Signature · 1 line
1.7.11.7
#1 lore raw
Quoted 20 lines · On Fri, Nov 23, 2012 at 3:07 AM, <[email protected]> wrote:

From: Ting Liu <[email protected]>

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-r1.ppce5500

---
 meta-oe/recipes-connectivity/samba/samba.inc      | 2 ++
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-connectivity/samba/samba.inc +0 -0
index faa2be0..c4430d1 100644

meta-oe/recipes-connectivity/samba/samba.inc do_install_append() { · line 92

Quoted 5 lines
meta-oe/recipes-connectivity/samba/samba.inc +2 -0
@@ -88,6 +88,8 @@ do_install_append() {
         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
 
+        sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/findsmb
+

Extra space?

-M

Quoted 19 lines
meta-oe/recipes-connectivity/samba/samba.inc +0 -0
 }
 
 
meta-oe/recipes-connectivity/samba/samba_3.6.8.bb +1 -2
index cc09a48..7c54dae 100644
@@ -3,7 +3,7 @@ require samba-basic.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "\
     file://config-h.patch \
--

1.7.11.7