[oe-commits] Saul Wold : eglibc: remove duplicate rquota files
git at git.openembedded.org
git at git.openembedded.org
Sun Sep 2 12:57:34 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: a155eee07dc8eb369ae897b702a14826e370bf5a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a155eee07dc8eb369ae897b702a14826e370bf5a
Author: Saul Wold <sgw at linux.intel.com>
Date: Fri Aug 31 13:52:41 2012 -0700
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 at linux.intel.com>
---
meta/recipes-core/eglibc/eglibc-package.inc | 1 +
meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +-
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 bd46cb8..edf7a75 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 3b11892..c4bc18c 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"
More information about the Openembedded-commits
mailing list