diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-07-27 16:36:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-30 09:16:53 +0100 |
commit | a0748b00142d668dccd23d204ff783efd93bec72 (patch) | |
tree | f91b94651445feb1b499c162c7eca5ec574c5deb /meta/recipes-core/glibc | |
parent | 11cc1a1a882a7eb012c312b953cb5939feba985f (diff) | |
download | poky-a0748b00142d668dccd23d204ff783efd93bec72.tar.gz |
glibc-locale: use stricter matching for metapackages' runtime dependencies
This resolves two issues:
1. metapackages were depending on themselves (except -binaries which wouldn't match against 'glibc-binary').
2. for the nativesdk variant, due to a non-empty dependency list at parsing time caused by
issue 1, map_depends_variable() from meta/lib/oe/classextend.py was forcibly setting PACKAGES
to the initial parse-time value (e.g. missing the dynamically created packages). This meant that
three out of four nativesdk- metapackages were entireyly missing the dependencies on the
respective dynamic package sets.
(From OE-Core rev: a90fd3afe9184aa1870b34a826e3ba0563477d4b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-locale.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index 760de9437b..289f58d4df 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc | |||
@@ -37,22 +37,22 @@ PACKAGES_DYNAMIC = "^locale-base-.* \ | |||
37 | # Create a glibc-binaries package | 37 | # Create a glibc-binaries package |
38 | ALLOW_EMPTY:${BPN}-binaries = "1" | 38 | ALLOW_EMPTY:${BPN}-binaries = "1" |
39 | PACKAGES += "${BPN}-binaries" | 39 | PACKAGES += "${BPN}-binaries" |
40 | RRECOMMENDS:${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary") != -1])}" | 40 | RRECOMMENDS:${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-binary-") != -1])}" |
41 | 41 | ||
42 | # Create a glibc-charmaps package | 42 | # Create a glibc-charmaps package |
43 | ALLOW_EMPTY:${BPN}-charmaps = "1" | 43 | ALLOW_EMPTY:${BPN}-charmaps = "1" |
44 | PACKAGES += "${BPN}-charmaps" | 44 | PACKAGES += "${BPN}-charmaps" |
45 | RRECOMMENDS:${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap") != -1])}" | 45 | RRECOMMENDS:${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-charmap-") != -1])}" |
46 | 46 | ||
47 | # Create a glibc-gconvs package | 47 | # Create a glibc-gconvs package |
48 | ALLOW_EMPTY:${BPN}-gconvs = "1" | 48 | ALLOW_EMPTY:${BPN}-gconvs = "1" |
49 | PACKAGES += "${BPN}-gconvs" | 49 | PACKAGES += "${BPN}-gconvs" |
50 | RRECOMMENDS:${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv") != -1])}" | 50 | RRECOMMENDS:${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-gconv-") != -1])}" |
51 | 51 | ||
52 | # Create a glibc-localedatas package | 52 | # Create a glibc-localedatas package |
53 | ALLOW_EMPTY:${BPN}-localedatas = "1" | 53 | ALLOW_EMPTY:${BPN}-localedatas = "1" |
54 | PACKAGES += "${BPN}-localedatas" | 54 | PACKAGES += "${BPN}-localedatas" |
55 | RRECOMMENDS:${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata") != -1])}" | 55 | RRECOMMENDS:${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES').split() if p.find("glibc-localedata-") != -1])}" |
56 | 56 | ||
57 | DESCRIPTION:localedef = "glibc: compile locale definition files" | 57 | DESCRIPTION:localedef = "glibc: compile locale definition files" |
58 | 58 | ||