[OE-core] [PATCH v2] icu: upgrade 68.2 -> 69.1

[OE-core] [PATCH v2] icu: upgrade 68.2 -> 69.1

[wangmy]

refresh 0001-icu-Added-armeb-support.patch

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../icu/icu/0001-icu-Added-armeb-support.patch              | 6 +++---
 meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb}       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb} (96%)

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 145efc0e01..c5dc0611c2 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,7 +13,7 @@ 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 8c6a0e1..cf89907 100644
+index c937463..feaad0f 100644
 --- a/i18n/double-conversion-utils.h
 +++ b/i18n/double-conversion-utils.h
 @@ -115,7 +115,7 @@ int main(int argc, char** argv) {
@@ -24,7 +24,7 @@ index 8c6a0e1..cf89907 100644
 +    defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
      defined(__hppa__) || defined(__ia64__) || \
      defined(__mips__) || \
-     defined(__nios2__) || \
+     defined(__nios2__) || defined(__ghs) || \
 -- 
-2.7.4
+2.25.1
 
diff --git a/meta/recipes-support/icu/icu_68.2.bb b/meta/recipes-support/icu/icu_69.1.bb
similarity index 96%
rename from meta/recipes-support/icu/icu_68.2.bb
rename to meta/recipes-support/icu/icu_69.1.bb
index 1ca87feee4..bfeea8d2f0 100644
--- a/meta/recipes-support/icu/icu_68.2.bb
+++ b/meta/recipes-support/icu/icu_69.1.bb
@@ -112,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] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
-SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3"
+SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"
+SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"
 
 UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
 UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
-- 
2.25.1

Re: [OE-core] [PATCH v2] icu: upgrade 68.2 -> 69.1

[Khem Raj]

i think thls build failure is related

On Thu, Apr 15, 2021 at 1:32 AM wangmy <wangmy@fujitsu.com> wrote:
>
> refresh 0001-icu-Added-armeb-support.patch
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  .../icu/icu/0001-icu-Added-armeb-support.patch              | 6 +++---
>  meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb}       | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
>  rename meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb} (96%)
>
> 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 145efc0e01..c5dc0611c2 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,7 +13,7 @@ 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 8c6a0e1..cf89907 100644
> +index c937463..feaad0f 100644
>  --- a/i18n/double-conversion-utils.h
>  +++ b/i18n/double-conversion-utils.h
>  @@ -115,7 +115,7 @@ int main(int argc, char** argv) {
> @@ -24,7 +24,7 @@ index 8c6a0e1..cf89907 100644
>  +    defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
>       defined(__hppa__) || defined(__ia64__) || \
>       defined(__mips__) || \
> -     defined(__nios2__) || \
> +     defined(__nios2__) || defined(__ghs) || \
>  --
> -2.7.4
> +2.25.1
>
> diff --git a/meta/recipes-support/icu/icu_68.2.bb b/meta/recipes-support/icu/icu_69.1.bb
> similarity index 96%
> rename from meta/recipes-support/icu/icu_68.2.bb
> rename to meta/recipes-support/icu/icu_69.1.bb
> index 1ca87feee4..bfeea8d2f0 100644
> --- a/meta/recipes-support/icu/icu_68.2.bb
> +++ b/meta/recipes-support/icu/icu_69.1.bb
> @@ -112,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] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
> -SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3"
> +SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"
> +SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"
>
>  UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
>  UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
> --
> 2.25.1
>
>
> 
>