]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
icu: split at '.' instead of '-' for major version
authorYannic Moog <y.moog@phytec.de>
Wed, 14 Jan 2026 09:32:05 +0000 (10:32 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 15 Jan 2026 13:54:06 +0000 (13:54 +0000)
With version 78.1, icu adopted '.' as separator between major and minor
version. With the upgrade commit, ICU_MAJOR_VER wasn't updated and still
tried to split versions with '-' instead of '.'. Fix by using '.' as
separator.

The error was missed with poky, because PACKAGECONFIG does not contain
make-icudata. See

do_make_icudata:class-target () {
    ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
    [...]
    install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
}

for which the install -Dm644 [...] command above would fail when
PACKAGECONFIG contains make-icudata.

Fixes: 479d48503dd2 ("upgrade 77-1 -> 78.1")
Signed-off-by: Yannic Moog <y.moog@phytec.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-support/icu/icu_78.1.bb

index 8827f05f5190ddd364fd9f0a139ca6588809e04e..ee7245c27bf101da3623658d044239c45859d6f0 100644 (file)
@@ -13,7 +13,7 @@ CVE_PRODUCT = "international_components_for_unicode"
 S = "${UNPACKDIR}/icu/source"
 STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}"
 
-ICU_MAJOR_VER = "${@d.getVar('PV').split('-')[0]}"
+ICU_MAJOR_VER = "${@d.getVar('PV').split('.')[0]}"
 
 inherit autotools pkgconfig github-releases