From: Saul Wold <sgw@linux.intel.com>
Date: Fri, 31 Aug 2012 20:52:41 +0000 (-0700)
Subject: eglibc: remove duplicate rquota files
X-Git-Tag: 2015-4~9347
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a155eee07dc8eb369ae897b702a14826e370bf5a;p=openembedded-core.git

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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

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 () {
 	if [ -f ${D}${bindir}/mtrace ]; then
 		sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
 	fi
+	rm -rf ${D}${includedir}/rpcsvc/rquota*
 }
 
 do_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
 SRCREV = "20393"
 
 DEPENDS += "gperf-native"
-PR = "r6"
+PR = "r7"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_16"