summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 702d8403be..cb6893f3c2 100644
--- a/meta/lib/oe/package.py
+++ b/meta/lib/oe/package.py
@@ -647,8 +647,11 @@ def split_locales(d):
647 dvar = d.getVar('PKGD') 647 dvar = d.getVar('PKGD')
648 pn = d.getVar('LOCALEBASEPN') 648 pn = d.getVar('LOCALEBASEPN')
649 649
650 if pn + '-locale' in packages: 650 try:
651 packages.remove(pn + '-locale') 651 locale_index = packages.index(pn + '-locale')
652 packages.pop(locale_index)
653 except ValueError:
654 locale_index = len(packages)
652 655
653 localedir = os.path.join(dvar + datadir, 'locale') 656 localedir = os.path.join(dvar + datadir, 'locale')
654 657
@@ -665,7 +668,8 @@ def split_locales(d):
665 for l in sorted(locales): 668 for l in sorted(locales):
666 ln = legitimize_package_name(l) 669 ln = legitimize_package_name(l)
667 pkg = pn + '-locale-' + ln 670 pkg = pn + '-locale-' + ln
668 packages.append(pkg) 671 packages.insert(locale_index, pkg)
672 locale_index += 1
669 d.setVar('FILES:' + pkg, os.path.join(datadir, 'locale', l)) 673 d.setVar('FILES:' + pkg, os.path.join(datadir, 'locale', l))
670 d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) 674 d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
671 d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) 675 d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))