diff options
| author | Ting Liu <b28495@freescale.com> | 2012-12-14 08:19:41 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-12-16 21:11:43 +0100 |
| commit | 86c8f4503c7d2965322b442686e0c1a43ed15e7c (patch) | |
| tree | b39e32bcf358d944e02787e0455397605835b3ea /meta-oe | |
| parent | 6bb2148746ba8cd2eb23ad54798efda47bef77c6 (diff) | |
| download | meta-openembedded-86c8f4503c7d2965322b442686e0c1a43ed15e7c.tar.gz | |
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@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-connectivity/samba/samba.inc | 7 | ||||
| -rw-r--r-- | 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 d39a84a913..416334a5d0 100644 --- a/meta-oe/recipes-connectivity/samba/samba.inc +++ b/meta-oe/recipes-connectivity/samba/samba.inc | |||
| @@ -84,11 +84,12 @@ do_install_append() { | |||
| 84 | install -d ${D}/var/log/samba | 84 | install -d ${D}/var/log/samba |
| 85 | install -d ${D}/var/spool/samba | 85 | install -d ${D}/var/spool/samba |
| 86 | 86 | ||
| 87 | # Install other stuff not installed by "make install" | 87 | # Install other stuff not installed by "make install" |
| 88 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 | 88 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_winbind.so ${D}${libdir}/libnss_winbind.so.2 |
| 89 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 | 89 | install -m 0644 ${WORKDIR}/${PN}-${PV}/nsswitch/libnss_wins.so ${D}${libdir}/libnss_wins.so.2 |
| 90 | 90 | ||
| 91 | rmdir ${D}${base_sbindir} | 91 | rmdir ${D}${base_sbindir} |
| 92 | sed -i -e '1s,#!.*perl,#!${USRBINPATH}/env perl,' ${D}${bindir}/findsmb | ||
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | 95 | ||
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 4750ecb61f..5722cb6e57 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 | |||
| 3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
| 4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://../COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 5 | 5 | ||
| 6 | PR = "r3" | 6 | PR = "r4" |
| 7 | 7 | ||
| 8 | SRC_URI += "\ | 8 | SRC_URI += "\ |
| 9 | file://config-h.patch \ | 9 | file://config-h.patch \ |
