* [PATCH] eglibc: remove duplicate rquota files
@ 2012-08-31 21:38 Saul Wold
2012-08-31 22:48 ` Khem Raj
0 siblings, 1 reply; 2+ messages in thread
From: Saul Wold @ 2012-08-31 21:38 UTC (permalink / raw)
To: openembedded-core
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] eglibc: remove duplicate rquota files
2012-08-31 21:38 [PATCH] eglibc: remove duplicate rquota files Saul Wold
@ 2012-08-31 22:48 ` Khem Raj
0 siblings, 0 replies; 2+ messages in thread
From: Khem Raj @ 2012-08-31 22:48 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-31 23:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-31 21:38 [PATCH] eglibc: remove duplicate rquota files Saul Wold
2012-08-31 22:48 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.