Patchwork [meta-oe] samba: Fix build on Fedora 17

login
register
mail settings
Submitter Ting Liu
Date Nov. 23, 2012, 9:07 a.m.
Message ID <1353661652-29949-1-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/39533/
State Superseded, archived
Headers show

Comments

Ting Liu - Nov. 23, 2012, 9:07 a.m.
From: Ting Liu <b28495@freescale.com>

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

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 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(-)
McClintock Matthew-B29882 - Nov. 27, 2012, 10:04 p.m.
On Fri, Nov 23, 2012 at 3:07 AM,  <b28495@freescale.com> wrote:
> From: Ting Liu <b28495@freescale.com>
>
> 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
>
> Signed-off-by: Ting Liu <b28495@freescale.com>
> ---
>  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(-)
>
> diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
> index faa2be0..c4430d1 100644
> --- a/meta-oe/recipes-connectivity/samba/samba.inc
> +++ b/meta-oe/recipes-connectivity/samba/samba.inc
> @@ -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

>  }
>
>
> 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 cc09a48..7c54dae 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 = "r1"
> +PR = "r2"
>
>  SRC_URI += "\
>      file://config-h.patch \
> --
> 1.7.11.7
>

Patch

diff --git a/meta-oe/recipes-connectivity/samba/samba.inc b/meta-oe/recipes-connectivity/samba/samba.inc
index faa2be0..c4430d1 100644
--- a/meta-oe/recipes-connectivity/samba/samba.inc
+++ b/meta-oe/recipes-connectivity/samba/samba.inc
@@ -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
+
 }
 
 
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 cc09a48..7c54dae 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 = "r1"
+PR = "r2"
 
 SRC_URI += "\
     file://config-h.patch \