Re: [OE-core][PATCH] icu: upgrade 66.1 -> 67.1

Alexander Kanavin
2020-05-01T13:56:29Z

[-- Attachment #1: Type: text/plain, Size: 11193 bytes --]

Hello Andrej,

can you publish the patch in git somewhere so I could take a look at
exactly what goes wrong? Occasionally we have patches that can't make it
through the mailing list for whatever reason, then RP pulls them directly
from git on request.

Alex

On Fri, 1 May 2020 at 15:48, Valek, Andrej <andrej.valek@siemens.com> wrote:

> Hello Alex,
>
> I wanted to upgrade ICU to 67.1 release but without success. Locally it
> was working as well. When I was trying to apply the upgrading patch it
> failed. I realized that, there are mixed line endings Linux/Windows. I am
> able to apply patch with "git am --keep-cr", but It's still failing on
> patchwork.
>
> I was trying to send the patch with different encodings, auto, 7bit, but
> still without success (3-times). Which kind of "
> --transfer-encoding=(7bit|8bit|quoted-printable|base64" should I use for
> it? Is there an another way to submit the patch?
>
> Thank you,
> Andrej
>
> -----Original Message-----
> From: Andrej Valek <andrej.valek@siemens.com>
> Sent: Friday, May 1, 2020 10:26 AM
> To: openembedded-core@lists.openembedded.org
> Cc: Valek, Andrej (IOT DS EU SK SI-BP1) <andrej.valek@siemens.com>
> Subject: [OE-core][PATCH] icu: upgrade 66.1 -> 67.1
>
> - 0001-icu-Added-armeb-support.patch - rebased
> - 0001-Fix-big-endian-build.patch - removed, already included in new
> version
> - icu-pkgdata-large-cmd.patch - removed, implemented correct size
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> .../icu/icu/0001-Fix-big-endian-build.patch | 28 -------------
> .../icu/icu/0001-icu-Added-armeb-support.patch | 6 +--
> .../icu/icu/icu-pkgdata-large-cmd.patch | 49
> ----------------------
> .../icu/{icu_66.1.bb => icu_67.1.bb} | 7 +---
> 4 files changed, 5 insertions(+), 85 deletions(-) delete mode 100644
> meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
> delete mode 100644
> meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
> rename meta/recipes-support/icu/{icu_66.1.bb => icu_67.1.bb} (84%)
>
> diff --git a/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
> b/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
> deleted file mode 100644
> index 91d68848c7..0000000000
> --- a/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 9be0b489a94b57419202c552022f25cb95bfac51 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Wed, 17 Apr 2019 16:41:58 +0200
> -Subject: [PATCH] Fix big-endian build
> -
> -Bug-report:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Funicode-org.atlassian.net%2Fbrowse%2FICU-20533&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=lkF0ueFchcq6kB67u%2BE52DnoJTVlb%2BhD5YtUQKo2TWI%3D&amp;reserved=0
> -Patch
> <https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Funicode-org.atlassian.net%2Fbrowse%2FICU-20533&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=lkF0ueFchcq6kB67u%2BE52DnoJTVlb%2BhD5YtUQKo2TWI%3D&amp;reserved=0-Patch>
> taken from:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.gentoo.org%2F682170&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=GiOAPhwkklHKkOtWwBWk6RdbyvvHiNGii7U1psFjhx8%3D&amp;reserved=0
> -
> -it is applied upstream and will be in version 67+
> -
> -Upstream-Status: Backport [
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Funicode-org%2Ficu%2Fcommit%2F4a3a457b38cd828b7b3fa4fdbc6e2504a57275e9&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=sqj%2B6HJBvmGjkMFTUOoW2%2F9pHppNCQDhjp4pufpfSDM%3D&amp;reserved=0
> ]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ----
> - data/Makefile.in | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> ---- a/data/Makefile.in
> -+++ b/data/Makefile.in
> -@@ -148,7 +148,8 @@ ICUDATA_ARCHIVE = $(firstword $(wildcard
> - # and convert it to the current type.
> - ifneq ($(ICUDATA_ARCHIVE),)
> - ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
> --$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
> -+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
> -+ $(MKINSTALLDIRS) $(OUTDIR)
> - $(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR)
> $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
> - endif
> - else
> diff --git
> a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
> b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
> index 299689d95c..145efc0e01 100644
> --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
> +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch
> @@ -13,10 +13,10 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/i18n/double-conversion-utils.h
> b/i18n/double-conversion-utils.h -index 1e44fca..e4f2a8b 100644
> +index 8c6a0e1..cf89907 100644
> --- a/i18n/double-conversion-utils.h
> +++ b/i18n/double-conversion-utils.h
> -@@ -92,7 +92,7 @@ int main(int argc, char** argv) {
> +@@ -115,7 +115,7 @@ int main(int argc, char** argv) {
> //
> // If it prints "correct" then the architecture should be here, in the
> "correct" section.
> #if defined(_M_X64) || defined(__x86_64__) || \ @@ -24,7 +24,7 @@ index
> 1e44fca..e4f2a8b 100644
> + defined(__arm__) || defined(__avr32__) || defined(_M_ARM) ||
> defined(_M_ARM64) || \
> defined(__hppa__) || defined(__ia64__) || \
> defined(__mips__) || \
> - defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
> + defined(__nios2__) || \
> --
> 2.7.4
>
> diff --git a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
> b/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
> deleted file mode 100644
> index e758a623ef..0000000000
> --- a/meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -pkgdata.cpp: use LARGE_BUFFER_MAX_SIZE for cmd
> -
> -Use LARGE_BUFFER_MAX_SIZE for cmd rather than SMALL_BUFFER_MAX_SIZE,
> -otherwise there was a Segmentation fault error when the command line is
> -long, this should be a misplay since other cmd uses -LARGE_BUFFER_MAX_SIZE.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ----
> - tools/pkgdata/pkgdata.cpp | 6 +++---
> - 1 file changed, 3 insertions(+), 3 deletions(-)
> -
> -diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp -index
> 60167dd..506dd32 100644
> ---- a/tools/pkgdata/pkgdata.cpp
> -+++ b/tools/pkgdata/pkgdata.cpp
> -@@ -1084,7 +1084,7 @@ normal_symlink_mode:
> -
> - static int32_t pkg_installLibrary(const char *installDir, const char
> *targetDir, UBool noVersion) {
> - int32_t result = 0;
> -- char cmd[SMALL_BUFFER_MAX_SIZE];
> -+ char cmd[LARGE_BUFFER_MAX_SIZE];
> -
> - sprintf(cmd, "cd %s && %s %s %s%s%s",
> - targetDir,
> -@@ -1152,7 +1152,7 @@ static int32_t pkg_installLibrary(const char
> *installDir, const char *targetDir,
> -
> - static int32_t pkg_installCommonMode(const char *installDir, const char
> *fileName) {
> - int32_t result = 0;
> -- char cmd[SMALL_BUFFER_MAX_SIZE] = "";
> -+ char cmd[LARGE_BUFFER_MAX_SIZE] = "";
> -
> - if (!T_FileStream_file_exists(installDir)) {
> - UErrorCode status = U_ZERO_ERROR;
> -@@ -1184,7 +1184,7 @@ static int32_t pkg_installCommonMode(const char
> *installDir, const char *fileNam
> - #endif
> - static int32_t pkg_installFileMode(const char *installDir, const char
> *srcDir, const char *fileListName) {
> - int32_t result = 0;
> -- char cmd[SMALL_BUFFER_MAX_SIZE] = "";
> -+ char cmd[LARGE_BUFFER_MAX_SIZE] = "";
> -
> - if (!T_FileStream_file_exists(installDir)) {
> - UErrorCode status = U_ZERO_ERROR;
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-support/icu/icu_66.1.bb
> b/meta/recipes-support/icu/icu_67.1.bb
> similarity index 84%
> rename from meta/recipes-support/icu/icu_66.1.bb
> rename to meta/recipes-support/icu/icu_67.1.bb
> index f2bb344e33..58638507c9 100644
> --- a/meta/recipes-support/icu/icu_66.1.bb
> +++ b/meta/recipes-support/icu/icu_67.1.bb
> @@ -22,17 +22,15 @@ DATA_SRC_URI = "
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Funicode-org%2Ficu%2Freleases%2Fdownload%2Frelease-%24&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=tOWF0krhT2h0ba16I8RDpLLqZglg4o48ULQg5xW7OjI%3D&amp;reserved=0{I
> <https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Funicode-org%2Ficu%2Freleases%2Fdownload%2Frelease-%24&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=tOWF0krhT2h0ba16I8RDpLLqZglg4o48ULQg5xW7OjI%3D&amp;reserved=0%7BI>
> SRC_URI = "${BASE_SRC_URI};name=code \
> ${DATA_SRC_URI};name=data \
> file://filter.json \
> - file://icu-pkgdata-large-cmd.patch \
> file://fix-install-manx.patch \
> - file://0001-Fix-big-endian-build.patch;apply=no \
> file://0001-icu-Added-armeb-support.patch \
> "
>
> SRC_URI_append_class-target = "\
> file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
> "
> -SRC_URI[code.sha256sum] =
> "52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"
> -SRC_URI[data.sha256sum] =
> "8be647f738891d2beb79d48f99077b3499948430eae6f1be112553b15ab0243e"
> +SRC_URI[code.sha256sum] =
> "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc"
> +SRC_URI[data.sha256sum] =
> "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e"
>
> UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
> UPSTREAM_CHECK_URI = "
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Funicode-org%2Ficu%2Freleases&amp;data=02%7C01%7Candrej.valek%40siemens.com%7Cf699ca9e0c5e4e6a04f908d7eda96fbb%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637239184284814122&amp;sdata=oc4vNTJru5V9fuwz7ODlmQDVMB8EQF6EkXT1mfGM1gA%3D&amp;reserved=0
> "
> @@ -43,7 +41,6 @@ do_make_icudata_class-target () {
> cd ${S}
> rm -rf data
> cp -a ${WORKDIR}/data .
> - patch -p1 < ${WORKDIR}/0001-Fix-big-endian-build.patch
> AR='${BUILD_AR}' \
> CC='${BUILD_CC}' \
> CPP='${BUILD_CPP}' \
> --
> 2.11.0
>
>

[-- Attachment #2: Type: text/html, Size: 14837 bytes --]