[oe-commits] org.oe.dev Add glibc-* to equivalent eglibc-* packages in RPROVIDES.

[khem commit]

Add glibc-* to equivalent eglibc-* packages in RPROVIDES.

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: b777d230f7bec689207f7ee124e2e5ab5461b361
ViewMTN: http://monotone.openembedded.org/revision/info/b777d230f7bec689207f7ee124e2e5ab5461b361
Files:
1
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
Diffs:

#
# mt diff -r676667f842616031c72d72d4fb59ca7629da63ba -rb777d230f7bec689207f7ee124e2e5ab5461b361
#
# 
# 
# patch "packages/glibc/eglibc-package.bbclass"
#  from [f2443f95a6774f6041c3f94cbf9583fb4644b260]
#    to [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [f37cb5c2f3c0bbc766306cbd58bd7aaf336de265]
#    to [e0e53388d3e2f7fb82da6c0800429fb089aaa667]
# 
============================================================
--- packages/glibc/eglibc-package.bbclass	f2443f95a6774f6041c3f94cbf9583fb4644b260
+++ packages/glibc/eglibc-package.bbclass	8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e
@@ -27,7 +27,7 @@ PACKAGES = "eglibc-dbg eglibc catchsegv 
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
-PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
 
 RPROVIDES_eglibc = "glibc"
 RPROVIDES_eglibc-utils = "glibc-utils"
@@ -210,6 +210,7 @@ python package_do_split_gconvs () {
 		f.close()
 		if deps != []:
 			bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d)
+		bb.data.setVar('RPROVIDES_%s' % pkg, 'glibc-localedata-%s' % group, d)
 
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='eglibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' eglibc-gconv', d)
@@ -261,6 +262,7 @@ python package_do_split_gconvs () {
 		else:
 			eglibc_name = name
 		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('eglibc-binary-localedata-%s' % eglibc_name), d)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, 'glibc-binary-localedata-%s' % group, d)
 		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
 		m = re.match("(.*)_(.*)", name)
 		if m:
============================================================
--- packages/glibc/eglibc_svn.bb	f37cb5c2f3c0bbc766306cbd58bd7aaf336de265
+++ packages/glibc/eglibc_svn.bb	e0e53388d3e2f7fb82da6c0800429fb089aaa667
@@ -1,9 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 require glibc.inc
 
 DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.6+svnr${SRCREV}"
-PR = "r1"
+PV = "2.7+svnr${SRCREV}"
+PR = "r2"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://etc/ld.so.conf \
            file://generate-supported.mk"