Update the recipe to reflect the change in version separator.
Signed-off-by: Alexander Kanavin <[email protected]>
---
.../icu/{icu_71.1.bb => icu_72-1.bb} | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
rename meta/recipes-support/icu/{icu_71.1.bb => icu_72-1.bb} (87%)
diff --git a/meta/recipes-support/icu/icu_71.1.bb
b/meta/recipes-support/icu/icu_72-1.bb
similarity index 87%
rename from meta/recipes-support/icu/icu_71.1.bb
rename to meta/recipes-support/icu/icu_72-1.bb
index df999dce3b..2b20bdd7b2 100644
--- a/meta/recipes-support/icu/icu_71.1.bb
+++ b/meta/recipes-support/icu/icu_72-1.bb
@@ -15,7 +15,7 @@ S = "${WORKDIR}/icu/source"
SPDX_S = "${WORKDIR}/icu"
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
@@ -54,8 +54,8 @@ do_install:append:class-target() {
# The native pkgdata can not generate the correct data file.
# Use icupkg to re-generate it.
if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then
- rm -f ${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
- icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
${D}/${datadir}/${BPN}/${PV}/icudt${ICU_MAJOR_VER}b.dat
+ rm -f
${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat
+ icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat
${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat
fi
# Remove build host references...
@@ -63,8 +63,8 @@ do_install:append:class-target() {
-e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
-e 's|${DEBUG_PREFIX_MAP}||g' \
-e 's:${HOSTTOOLS_DIR}/::g' \
- ${D}/${libdir}/${BPN}/${PV}/Makefile.inc \
- ${D}/${libdir}/${BPN}/${PV}/pkgdata.inc
+ ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/Makefile.inc \
+ ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/pkgdata.inc
}
PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio"
@@ -82,13 +82,17 @@ BBCLASSEXTEND = "native nativesdk"
LIC_FILES_CHKSUM = "file://../LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f"
def icu_download_version(d):
- pvsplit = d.getVar('PV').split('.')
+ pvsplit = d.getVar('PV').split('-')
return pvsplit[0] + "_" + pvsplit[1]
def icu_download_folder(d):
- pvsplit = d.getVar('PV').split('.')
+ pvsplit = d.getVar('PV').split('-')
return pvsplit[0] + "-" + pvsplit[1]
+def icu_install_folder(d):
+ pvsplit = d.getVar('PV').split('-')
+ return pvsplit[0] + "." + pvsplit[1]
+
ICU_PV = "${@icu_download_version(d)}"
ICU_FOLDER = "${@icu_download_folder(d)}"
@@ -108,8 +112,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \
SRC_URI:append:class-target = "\
file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
"
-SRC_URI[code.sha256sum] =
"67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"
-SRC_URI[data.sha256sum] =
"e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"
+SRC_URI[code.sha256sum] =
"a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68"
+SRC_URI[data.sha256sum] =
"ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea"
UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)"
GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases";
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173594):
https://lists.openembedded.org/g/openembedded-core/message/173594
Mute This Topic: https://lists.openembedded.org/mt/95151310/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
