[oe-commits] Otavio Salvador : package.bbclass, package_ipk.bbclass: add dynamic depends on locale packages (ipk specific)

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a045dfacf6f2541e0f410d9d109581f181303756
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a045dfacf6f2541e0f410d9d109581f181303756

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue Nov 18 12:24:48 2008 -0200

package.bbclass, package_ipk.bbclass: add dynamic depends on locale packages (ipk specific)

---

 classes/package.bbclass     |   10 ----------
 classes/package_ipk.bbclass |    4 ++++
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index a7cdb5f..5559592 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -293,16 +293,6 @@ python package_do_split_locales() {
 		bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d)
 
 	bb.data.setVar('PACKAGES', ' '.join(packages), d)
-
-	# Disabled by RP 18/06/07
-	# Wildcards aren't supported in debian
-	# They break with ipkg since glibc-locale* will mean that 
-	# glibc-localedata-translit* won't install as a dependency
-	# for some other package which breaks meta-toolchain
-	# Probably breaks since virtual-locale- isn't provided anywhere
-	#rdep = (bb.data.getVar('RDEPENDS_%s' % mainpkg, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "").split()
-	#rdep.append('%s-locale*' % pn)
-	#bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
 }
 
 python populate_packages () {
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 3a97729..99f3793 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -244,6 +244,10 @@ python do_package_ipk () {
 		rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split()
 		rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split()
 		rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split()
+
+		if not '-locale-' and not '-dbg' and not '-dev' in pkgname
+			rdepends.append('%s-locale*' % pkgname)
+
 		if rdepends:
 			ctrlfile.write("Depends: %s\n" % ", ".join(rdepends))
 		if rsuggests: