From c381ca72437ab097cd04db63bfb6fb1e13880223 Mon Sep 17 00:00:00 2001 From: Jonathan GUILLOT Date: Thu, 30 Nov 2023 12:49:13 +0000 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oe/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/lib/oe/package.py') 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): dvar = d.getVar('PKGD') pn = d.getVar('LOCALEBASEPN') - if pn + '-locale' in packages: - packages.remove(pn + '-locale') + try: + locale_index = packages.index(pn + '-locale') + packages.pop(locale_index) + except ValueError: + locale_index = len(packages) localedir = os.path.join(dvar + datadir, 'locale') @@ -665,7 +668,8 @@ def split_locales(d): for l in sorted(locales): ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln - packages.append(pkg) + packages.insert(locale_index, pkg) + locale_index += 1 d.setVar('FILES:' + pkg, os.path.join(datadir, 'locale', l)) d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) -- cgit v1.2.3-54-g00ecf