icu: use git fetcher to bisect

* use dos2unix on 0001-Fix-big-endian-build.patch and
  0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch
  because the data directory in git uses unix endings while data
  zip file used before uses dos endings

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 24 insertions, 29 deletions

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
index 91d68848c7..0062a37634 100644
--- a/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
+++ b/meta/recipes-support/icu/icu/0001-Fix-big-endian-build.patch
@@ -17,12 +17,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 --- 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

+ # 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/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch
index d7ddf33bce..2b7b157c66 100644
--- a/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch
+++ b/meta/recipes-support/icu/icu/0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch
@@ -13,12 +13,12 @@ diff --git a/data/BUILDRULES.py b/data/BUILDRULES.py
 index 2338afd1f7..63b6e09273 100644
 --- a/data/BUILDRULES.py
 +++ b/data/BUILDRULES.py
-@@ -361,7 +361,7 @@ def generate_misc(config, io, common_vars):

-         RepeatedExecutionRequest(

-             name = "misc_res",

-             category = "misc",

--            dep_targets = [],

-+            dep_targets = [DepTarget("cnvalias")], # ICU-21175

-             input_files = input_files,

-             output_files = output_files,

-             tool = IcuTool("genrb"),

+@@ -361,7 +361,7 @@
+         RepeatedExecutionRequest(
+             name = "misc_res",
+             category = "misc",
+-            dep_targets = [],
++            dep_targets = [DepTarget("cnvalias")], # ICU-21175
+             input_files = input_files,
+             output_files = output_files,
+             tool = IcuTool("genrb"),
diff --git a/meta/recipes-support/icu/icu_66.1.bb b/meta/recipes-support/icu/icu_66.1.bb
index 89f5ead40e..4a4f8f2613 100644
--- a/meta/recipes-support/icu/icu_66.1.bb
+++ b/meta/recipes-support/icu/icu_66.1.bb
@@ -17,12 +17,10 @@ ICU_FOLDER = "${@icu_download_folder(d)}"
 ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
-BASE_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz"
-DATA_SRC_URI = "https://github.com/unicode-org/icu/releases/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip"
-SRC_URI = "${BASE_SRC_URI};name=code \
-           ${DATA_SRC_URI};name=data \
-           file://0001-Fix-big-endian-build.patch;patchdir=${WORKDIR} \
-           file://0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch;patchdir=${WORKDIR} \
+SRCREV = "5f681ecbc75898a6484217b322f3883b6d1b2049"
+SRC_URI = "git://github.com/unicode-org/icu.git \
+           file://0001-Fix-big-endian-build.patch \
+           file://0002-ICU-21175-Add-cnvalias-as-a-dependency-of-misc_res.patch \
            file://filter.json \
            file://0001-icu-fix-install-race.patch \
            file://0002-icu-Added-armeb-support.patch \
@@ -31,12 +29,11 @@ SRC_URI = "${BASE_SRC_URI};name=code \
            file://0006-ICU-21001-Fixing-problems-found-by-running-valgrind.patch \
            file://0007-ICU-21026-fix-GCC-warnings-of-signed-int-left-shift.patch \
            "
+S = "${WORKDIR}/git/icu4c/source"
 
 SRC_URI_append_class-target = "\
            file://0008-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[code.sha256sum] = "52a3f2209ab95559c1cf0a14f24338001f389615bf00e2585ef3dbc43ecf0a2e"
-SRC_URI[data.sha256sum] = "8be647f738891d2beb79d48f99077b3499948430eae6f1be112553b15ab0243e"
 
 UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
 UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
@@ -47,10 +44,8 @@ PACKAGECONFIG ?= ""
 PACKAGECONFIG[make-icudata] = ",,,"
 
 do_make_icudata_class-target () {
-    cd ${S}
-    rm -rf data
-    cp -a ${WORKDIR}/data .
     ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)}
+    cd ${S}
     AR='${BUILD_AR}' \
     CC='${BUILD_CC}' \
     CPP='${BUILD_CPP}' \