diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2009-02-13 14:07:08 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2009-02-13 14:07:08 -0200 |
| commit | 9e4e61a440edfa18f14ecf84272e10c9e22aa9c9 (patch) | |
| tree | 41a63c494413550537af9025d70736a6f611b30c /classes | |
| parent | 1bd17718ed3df6521b77d6aeef36e58db7fd1fda (diff) | |
| parent | 168ba1763b4b997cfb5bf5eefdbca8ae89f1dd2e (diff) | |
Merge branch 'master' of git://projetos.ossystems.com.br/git/users/otavio/org.openembedded.dev into org.openembedded.dev
* 'master' of git://projetos.ossystems.com.br/git/users/otavio/org.openembedded.dev:
flash-plugin: add 10.0.12.36
sun-jre6: add 1.6.0.10
parted: drop versions up to 1.8.8
package.bbclass, package_ipk.bbclass: add dynamic depends on locale packages (ipk specific)
cups: add 1.3.8.
rt61-firmware: add 1.2
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package.bbclass | 10 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index a7cdb5f2d5..55595928c6 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 3a977291ff..99f3793447 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: |