Patchwork eglibc: make eglibc-utils list explicit to avoid dragging localedef

login
register
mail settings
Submitter Koen Kooi
Date June 30, 2011, 10:50 a.m.
Message ID <1309431042-14267-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/6745/
State New, archived
Headers show

Comments

Koen Kooi - June 30, 2011, 10:50 a.m.
This fixes the following regression:

 * check_data_file_clashes: Package eglibc-utils wants to install file /usr/bin/localedef
        But that file is already provided by package  * localedef

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/eglibc/eglibc-package.inc |   16 +++++++++++++++-
 meta/recipes-core/eglibc/eglibc_2.12.bb     |    2 +-
 meta/recipes-core/eglibc/eglibc_2.13.bb     |    2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
Richard Purdie - June 30, 2011, 10:16 p.m.
On Thu, 2011-06-30 at 12:50 +0200, Koen Kooi wrote:
> This fixes the following regression:
> 
>  * check_data_file_clashes: Package eglibc-utils wants to install file /usr/bin/localedef
>         But that file is already provided by package  * localedef
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

This patch was a bit ugly and I've merged something simpler which didn't
need the hardcoded list :)

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 8228484..f3d133b 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -65,7 +65,21 @@  FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
 FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \
 	${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
-FILES_eglibc-utils = "${bindir}/* ${sbindir}/*"
+FILES_eglibc-utils = "${bindir}/gencat \
+                      ${bindir}/getconf \
+                      ${bindir}/getent \
+                      ${bindir}/iconv \
+                      ${bindir}/locale \
+                      ${bindir}/mtrace \
+                      ${bindir}/pcprofiledump \
+                      ${bindir}/rpcgen \
+                      ${bindir}/sprof \
+                      ${bindir}/tzselect \
+                      ${bindir}/xtrace \
+                      ${sbindir}/iconvconfig \
+                      ${sbindir}/rpcinfo \
+                      ${sbindir}/zdump \
+                      ${sbindir}/zic"
 FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
 FILES_catchsegv${PKGSUFFIX} = "${bindir}/catchsegv"
 RDEPENDS_catchsegv${PKGSUFFIX} = "libsegfault"
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 60358e1..85d58fa 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -1,7 +1,7 @@ 
 require eglibc.inc
 
 DEPENDS += "gperf-native"
-PR = "r17"
+PR = "r18"
 
 SRCREV = "14158"
 
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 5088049..7986131 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -4,7 +4,7 @@  SRCREV = "14157"
 
 DEPENDS += "gperf-native"
 FILESPATHPKG =. "eglibc-svn:"
-PR = "r4"
+PR = "r5"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"