summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-08-31 13:52:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:12 -0700
commit5a758d61469f1ceec7f55905f3450e054da11f98 (patch)
tree30525dcf7a6518d179e3569e5b61ebceb2ad3bdf /meta/recipes-core
parent175ba20246fa3889f409d1b4e7f828897867b70e (diff)
downloadpoky-5a758d61469f1ceec7f55905f3450e054da11f98.tar.gz
eglibc: remove duplicate rquota files
The /usr/include/rpcsvc/rquota* files are provided by both eglibc and the quota package. Quota's version is newer and a superset of eglibc's [YOCTO #238] (From OE-Core rev: a155eee07dc8eb369ae897b702a14826e370bf5a) Signed-off-by: Saul Wold <sgw@linux.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.inc1
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index bd46cb8561..edf7a759e6 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -83,6 +83,7 @@ do_install_append () {
83 if [ -f ${D}${bindir}/mtrace ]; then 83 if [ -f ${D}${bindir}/mtrace ]; then
84 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace 84 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
85 fi 85 fi
86 rm -rf ${D}${includedir}/rpcsvc/rquota*
86} 87}
87 88
88do_install_locale () { 89do_install_locale () {
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 3b11892e68..c4bc18c9d6 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "20393" 3SRCREV = "20393"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r6" 6PR = "r7"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_16" 9EGLIBC_BRANCH="eglibc-2_16"