summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc
diff options
context:
space:
mode:
authorPetter Mabäcker <petter@technux.se>2014-05-12 15:55:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-13 19:32:05 +0100
commit362b67769d8fc25a77eceefbdba099cdec894e65 (patch)
treeffd41c0559c857f7929aedf4504fb42bae385c11 /meta/recipes-core/eglibc
parentc631117d76a1d00a6b7f1f5492cb7d6f99a2f96a (diff)
downloadpoky-362b67769d8fc25a77eceefbdba099cdec894e65.tar.gz
eglibc: remove usage of FILESPATH
Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. If possible try to use any of the default FILESPATH dirs. Also remove superfluous comment and do minor indentation fix. (From OE-Core rev: 57109e59abb7c6af029f452d06b46f47084cff11) Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch (renamed from meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch)0
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.19.bb3
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.19.bb4
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb2
4 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
index 7618c99534..7618c99534 100644
--- a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
+++ b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
index 3ce0e1d394..1c13eb824a 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b
13inherit native 13inherit native
14inherit autotools 14inherit autotools
15 15
16# pick up an eglibc patch 16FILESEXTRAPATHS =. "${FILE_DIRNAME}/${P}:"
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18 17
19SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \ 18SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \
20 file://fix_for_centos_5.8.patch;patchdir=.. \ 19 file://fix_for_centos_5.8.patch;patchdir=.. \
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 8f096769ee..1ddce8224a 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -24,7 +24,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
24 file://0001-R_ARM_TLS_DTPOFF32.patch \ 24 file://0001-R_ARM_TLS_DTPOFF32.patch \
25 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 25 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
26 file://fix-tibetian-locales.patch \ 26 file://fix-tibetian-locales.patch \
27 file://ppce6500-32b_slow_ieee754_sqrt.patch \ 27 file://ppce6500-32b_slow_ieee754_sqrt.patch \
28 " 28 "
29SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd" 29SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
30SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c" 30SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
@@ -49,8 +49,6 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
49 49
50GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" 50GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
51 51
52FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
53
54# 52#
55# For now, we will skip building of a gcc package if it is a uclibc one 53# For now, we will skip building of a gcc package if it is a uclibc one
56# and our build is not a uclibc one, and we skip a glibc one if our build 54# and our build is not a uclibc one, and we skip a glibc one if our build
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index 75ffbf615a..7c3463589b 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -16,7 +16,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
16 16
17PR = "r2" 17PR = "r2"
18 18
19FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}/" 19FILESEXTRAPATHS =. "${FILE_DIRNAME}/${P}:"
20 20
21inherit native 21inherit native
22 22