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.
Signed-off-by: Jonathan GUILLOT <jonat...@joggee.fr>
---
meta/lib/oe/package.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py
index 9a465eaa09..2f7a50e144 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))
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192299):
https://lists.openembedded.org/g/openembedded-core/message/192299
Mute This Topic: https://lists.openembedded.org/mt/103150557/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
