diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-12 11:10:33 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2012-05-31 03:26:14 +0200 |
| commit | d409f1f7594944153bb8edd42fd4d8140b8964eb (patch) | |
| tree | 10d8ac8482bf75580e25f4ade5809500dd85a893 | |
| parent | a76e135e1be5a587fe38e24b6d60bdb1bace87d9 (diff) | |
| download | openembedded-core-contrib-d409f1f7594944153bb8edd42fd4d8140b8964eb.tar.gz | |
package.bbclass: Drop dubious use of packages[0] from do_split_packages and do_split_locales
As the comment says, using packages[0] is rather broken and can be incorrect,
as demonstrated by the recent gdk-pixbuf change. Replacing it with PN is
a bit more correct and more likely to do what was originally intended
by this function.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package.bbclass | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 44e551f6dd..c51b32d9a6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -107,14 +107,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst objs.append(relpath) if extra_depends == None: - # This is *really* broken - mainpkg = packages[0] - # At least try and patch it up I guess... - if mainpkg.find('-dbg'): - mainpkg = mainpkg.replace('-dbg', '') - if mainpkg.find('-dev'): - mainpkg = mainpkg.replace('-dev', '') - extra_depends = mainpkg + extra_depends = d.getVar("PN", True) for o in sorted(objs): import re, stat @@ -404,14 +397,6 @@ python package_do_split_locales() { locales = os.listdir(localedir) - # This is *really* broken - mainpkg = packages[0] - # At least try and patch it up I guess... - if mainpkg.find('-dbg'): - mainpkg = mainpkg.replace('-dbg', '') - if mainpkg.find('-dev'): - mainpkg = mainpkg.replace('-dev', '') - summary = d.getVar('SUMMARY', True) or pn description = d.getVar('DESCRIPTION', True) or "" locale_section = d.getVar('LOCALE_SECTION', True) @@ -420,7 +405,7 @@ python package_do_split_locales() { pkg = pn + '-locale-' + ln packages.append(pkg) d.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l)) - d.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg, ln)) + d.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (pn, ln)) d.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln)) d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) @@ -435,9 +420,9 @@ python package_do_split_locales() { # 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 = (d.getVar('RDEPENDS_%s' % mainpkg, True) or d.getVar('RDEPENDS', True) or "").split() + #rdep = (d.getVar('RDEPENDS_%s' % pn, True) or d.getVar('RDEPENDS', True) or "").split() #rdep.append('%s-locale*' % pn) - #d.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep)) + #d.setVar('RDEPENDS_%s' % pn, ' '.join(rdep)) } python perform_packagecopy () { |