Patchwork eglibc: remove duplicate rquota files

login
register
mail settings
Submitter Saul Wold
Date Aug. 31, 2012, 9:38 p.m.
Message ID <1346449092-22410-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/35613/
State Accepted
Commit a155eee07dc8eb369ae897b702a14826e370bf5a
Headers show

Comments

Saul Wold - Aug. 31, 2012, 9:38 p.m.
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>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    1 +
 meta/recipes-core/eglibc/eglibc_2.16.bb     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
Khem Raj - Aug. 31, 2012, 10:48 p.m.
On Fri, Aug 31, 2012 at 2:38 PM, Saul Wold <sgw@linux.intel.com> wrote:
> 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
>

looks good in general. Make sure that anybody who depended on rquota header
now has dependency on quota.

> [YOCTO #238]
>
> Signed-off-by: Saul Wold <sgw@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 af78456..056ef23 100644
> --- a/meta/recipes-core/eglibc/eglibc-package.inc
> +++ b/meta/recipes-core/eglibc/eglibc-package.inc
> @@ -86,6 +86,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 69803f7..c6fde6e 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"
> --
> 1.7.7.6
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index af78456..056ef23 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -86,6 +86,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 69803f7..c6fde6e 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"