diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-08-31 13:52:41 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:47:43 -0700 |
| commit | a155eee07dc8eb369ae897b702a14826e370bf5a (patch) | |
| tree | 79bff8d02de81df38a37f468674e05369ed4c610 /meta | |
| parent | f8bc059883a9bae92434bfb74fca352ad1e10199 (diff) | |
| download | openembedded-core-a155eee07dc8eb369ae897b702a14826e370bf5a.tar.gz openembedded-core-a155eee07dc8eb369ae897b702a14826e370bf5a.tar.bz2 openembedded-core-a155eee07dc8eb369ae897b702a14826e370bf5a.zip | |
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 1 | ||||
| -rw-r--r-- | 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 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" |