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:52:12 -0700 |
| commit | 5a758d61469f1ceec7f55905f3450e054da11f98 (patch) | |
| tree | 30525dcf7a6518d179e3569e5b61ebceb2ad3bdf /meta | |
| parent | 175ba20246fa3889f409d1b4e7f828897867b70e (diff) | |
| download | ast2050-yocto-poky-5a758d61469f1ceec7f55905f3450e054da11f98.zip ast2050-yocto-poky-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')
| -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 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" |
