summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-04-14 08:59:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 12:26:02 (GMT)
commit71b8383a6b2cc4c48424b5e3bd872de787b378b8 (patch)
tree69ffcff92f624b0a3fc92e6f579d756eda5288b6 /meta/recipes-core
parentfae4509e07289881618b278eb842abf694020686 (diff)
downloadpoky-71b8383a6b2cc4c48424b5e3bd872de787b378b8.tar.gz
eglibc: fix builds on fedora 17 alpha
Generally distros keep perl at /sur/bin/perl Fedora 17 alpha also has /bin/perl this causes eglibc build on such distros to put perl interpreter path in the perl scripts 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 like this: | error: Failed dependencies: | /bin/perl is needed by eglibc-utils-2.13-r23+svnr15508.i586 NOTE: package core-image-sato-1.0-r0: task do_rootfs: Failed ERROR: Task 8 (/home/nitin/prj/poky.git/meta/recipes-sato/images/core-image-sato.bb, do_rootfs) failed with exit code '1' This Fixes bug : [YOCTO #2286] RP: Updated to better account for -nativesdk (From OE-Core rev: 381bf0d364da5970682502f8f124264907587b87) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc7
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
3 files changed, 9 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 9e45fc1..0db221f 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -72,10 +72,17 @@ DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through
72 72
73inherit libc-common multilib_header 73inherit libc-common multilib_header
74 74
75PERLPATH = "${bindir}/env perl"
76PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
77
75do_install_append () { 78do_install_append () {
76 rm -f ${D}${sysconfdir}/localtime 79 rm -f ${D}${sysconfdir}/localtime
77 80
78 oe_multilib_header bits/syscall.h 81 oe_multilib_header bits/syscall.h
82
83 if [ -f ${D}${bindir}/mtrace ]; then
84 sed -i -e '1s,#!.*perl,#! ${PERLPATH},' -e '2s,exec.*perl,exec ${PERLPATH},' ${D}${bindir}/mtrace
85 fi
79} 86}
80 87
81do_install_locale () { 88do_install_locale () {
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index ec06261..d8a41dc 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r25" 6PR = "r26"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index caed9e9..713efc3 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "17386" 3SRCREV = "17386"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r5" 6PR = "r6"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_15" 9EGLIBC_BRANCH="eglibc-2_15"