diff options
author | Jonathan GUILLOT <jonathan@joggee.fr> | 2023-11-30 12:49:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-14 13:53:36 +0000 |
commit | c381ca72437ab097cd04db63bfb6fb1e13880223 (patch) | |
tree | b9ad061b506d9b491a321f7e96b9cb5095d2a407 /meta/lib/oe | |
parent | 8f855f1e84a53d10841fe074dac28229385fb67a (diff) | |
download | poky-c381ca72437ab097cd04db63bfb6fb1e13880223.tar.gz |
lib/oe/package: replace in place PN-locale-* packages in PACKAGES
split_locales() removes PN-locale from PACKAGES and adds PN-locale-* to the end.
As the PN-locale package typically appears before PN base package, it may result
in paths not installed in PN-locale-* packages if already catched by PN. Now
insert PN-locale-* exactly where PN-locale was existing in list to avoid such
an issue.
(From OE-Core rev: 108bc167ed0d43505af3140947a0ab79c89f0a7b)
Signed-off-by: Jonathan GUILLOT <jonathan@joggee.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package.py | 10 |
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)) |