diff options
author | Jonathan GUILLOT <jonathan@joggee.fr> | 2024-02-19 16:19:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-24 16:10:22 +0000 |
commit | ca25926d07c0f5a31cd04cff99185dab8a896b7e (patch) | |
tree | f8f206a1443d771550558bf5138c4dac46505809 | |
parent | 396bc832b75f5f83184367994305d28c6a186b09 (diff) | |
download | poky-ca25926d07c0f5a31cd04cff99185dab8a896b7e.tar.gz |
lib/oe/package: fix LOCALE_PATHS scan to create locale packages
split_locales() must only check subdirectories in paths added to
LOCALE_PATHS to avoid creating weird packages based on filenames also
present in paths.
Without such a filter, cups recipe adding ${datadir}/cups/templates to
LOCALE_PATHS creates the following incorrect packages:
- cups-locale-add-class.tmpl
- cups-locale-add-printer.tmpl
- cups-locale-admin.tmpl
(From OE-Core rev: ba3aee0d516bd066829d6edaa8d7bacdd75dd6ef)
Signed-off-by: Jonathan GUILLOT <jonathan@joggee.fr>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/documentation.conf | 2 | ||||
-rw-r--r-- | meta/lib/oe/package.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 90d8e82932..b0591881ba 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -271,7 +271,7 @@ LICENSE_PATH[doc] = "Path to additional licenses used during the build." | |||
271 | LINUX_KERNEL_TYPE[doc] = "Defines the kernel type to be used in assembling the configuration." | 271 | LINUX_KERNEL_TYPE[doc] = "Defines the kernel type to be used in assembling the configuration." |
272 | LINUX_VERSION[doc] = "The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe." | 272 | LINUX_VERSION[doc] = "The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe." |
273 | LINUX_VERSION_EXTENSION[doc] = "A string extension compiled into the version string of the Linux kernel built with the OpenEmbedded build system. You define this variable in the kernel recipe." | 273 | LINUX_VERSION_EXTENSION[doc] = "A string extension compiled into the version string of the Linux kernel built with the OpenEmbedded build system. You define this variable in the kernel recipe." |
274 | LOCALE_PATHS[doc] = "Whitespace separated list of paths that are scanned to construct locale packages. The list already contains ${datadir}/locale by default." | 274 | LOCALE_PATHS[doc] = "Whitespace separated list of paths that are scanned to construct locale packages. The list already contains ${datadir}/locale by default. Note that all subdirectories in these paths are assumed to be locales." |
275 | LOCALE_UTF8_IS_DEFAULT[doc] = "If set, locale names are renamed such that those lacking an explicit encoding (e.g. en_US) will always be UTF-8, and non-UTF-8 encodings are renamed to, e.g., en_US.ISO-8859-1. Otherwise, the encoding is specified by glibc's SUPPORTED file. Not supported for precompiled locales." | 275 | LOCALE_UTF8_IS_DEFAULT[doc] = "If set, locale names are renamed such that those lacking an explicit encoding (e.g. en_US) will always be UTF-8, and non-UTF-8 encodings are renamed to, e.g., en_US.ISO-8859-1. Otherwise, the encoding is specified by glibc's SUPPORTED file. Not supported for precompiled locales." |
276 | LOG_DIR[doc] = "Specifies the directory to which the OpenEmbedded build system writes overall log files. The default directory is ${TMPDIR}/log" | 276 | LOG_DIR[doc] = "Specifies the directory to which the OpenEmbedded build system writes overall log files. The default directory is ${TMPDIR}/log" |
277 | 277 | ||
diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index d1738d3b61..587810bdaf 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py | |||
@@ -652,11 +652,15 @@ def split_locales(d): | |||
652 | locales = set() | 652 | locales = set() |
653 | for localepath in (d.getVar('LOCALE_PATHS') or "").split(): | 653 | for localepath in (d.getVar('LOCALE_PATHS') or "").split(): |
654 | localedir = dvar + localepath | 654 | localedir = dvar + localepath |
655 | if cpath.isdir(localedir): | 655 | if not cpath.isdir(localedir): |
656 | locales.update(os.listdir(localedir)) | 656 | bb.debug(1, 'No locale files in %s' % localepath) |
657 | localepaths.append(localepath) | 657 | continue |
658 | else: | 658 | |
659 | bb.debug(1, "No locale files in %s" % localepath) | 659 | localepaths.append(localepath) |
660 | with os.scandir(localedir) as it: | ||
661 | for entry in it: | ||
662 | if entry.is_dir(): | ||
663 | locales.add(entry.name) | ||
660 | 664 | ||
661 | if len(locales) == 0: | 665 | if len(locales) == 0: |
662 | bb.debug(1, "No locale files in this package") | 666 | bb.debug(1, "No locale files in this package") |