mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00
Code Issues Projects Releases Wiki Activity

lib/oe/package: replace in place PN-locale-* packages in PACKAGES

Browse Source 
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>
This commit is contained in:
Jonathan GUILLOT
2023-11-30 12:49:13 +00:00
committed by Richard Purdie
parent 8f855f1e84
commit c381ca7243
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/package.py
+7 -3
View File
@@ -647,8 +647,11 @@ def split_locales(d):
dvar = d.getVar('PKGD') dvar = d.getVar('PKGD')
pn = d.getVar('LOCALEBASEPN') pn = d.getVar('LOCALEBASEPN')
if pn + '-locale' in packages: try:
packages.remove(pn + '-locale') locale_index = packages.index(pn + '-locale')
packages.pop(locale_index)
except ValueError:
locale_index = len(packages)
localedir = os.path.join(dvar + datadir, 'locale') localedir = os.path.join(dvar + datadir, 'locale')
@@ -665,7 +668,8 @@ def split_locales(d):
for l in sorted(locales): for l in sorted(locales):
ln = legitimize_package_name(l) ln = legitimize_package_name(l)
pkg = pn + '-locale-' + ln 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('FILES:' + pkg, os.path.join(datadir, 'locale', l))
d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))