diff options
| author | Khem Raj <raj.khem@gmail.com> | 2007-12-12 22:12:32 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2007-12-12 22:12:32 +0000 |
| commit | 6bcfbe338d719d5f7f3224aa4b06c6f49be32383 (patch) | |
| tree | 4df6d396648e14d5611dbfc83923197e10ffb5a1 /packages | |
| parent | 7d3280d01628b7f8f814b80e6d19ed76fc198b99 (diff) | |
Add glibc-* to equivalent eglibc-* packages in RPROVIDES.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/glibc/eglibc-package.bbclass | 4 | ||||
| -rw-r--r-- | packages/glibc/eglibc_svn.bb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index 0cb8497733..a859ac2ca9 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" 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: diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index da33cca3fa..ff68185bcc 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -2,8 +2,8 @@ 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" |