diff options
| author |   Milan Verespej <m.verespej@partner.samsung.com> | 2019-02-06 12:29:00 +0100 |
|---|---|---|
| committer | Milan Verespej <m.verespej@partner.samsung.com> | 2019-02-06 13:25:24 +0100 |
| commit | c9ea08f25a8764d2ad281faa722f03dc4fff1534 (patch) | |
| tree | e4265c70bb74ea65fec44726104939a308778446 /build | |
| parent | c2a14cfae6d19c3c6c09394ca710f1871a48983d (diff) | |
Use git format of patches
To avoid dependency on patch utility and to have standardized look
of patch file this change uses git-format and git-apply to patch
charts.
Change-Id: I1c63334619bf6091b5ab50a4eebfadb3c28a2616
Issue-ID: OOM-1634
Signed-off-by: Milan Verespej <m.verespej@partner.samsung.com>
Diffstat (limited to 'build')
| -rwxr-xr-x | build/fetch_and_patch_charts.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/fetch_and_patch_charts.sh b/build/fetch_and_patch_charts.sh index 5000dbf5..cde42656 100755 --- a/build/fetch_and_patch_charts.sh +++ b/build/fetch_and_patch_charts.sh @@ -51,6 +51,7 @@ fi # git and patch tools are preconditions for this to work CURR=1 TOTAL=5 +PATCH_FILE=$(realpath "${3}") echo -e "${_G}[Step $((CURR++))/${TOTAL} cloning repo with charts to be patched]${C_}" git clone "${1}" "${4}" @@ -62,7 +63,7 @@ echo -e "${_G}[Step $((CURR++))/${TOTAL} git-checkout to correct base]${C_}" git checkout "${2}" echo -e "${_G}[Step $((CURR++))/${TOTAL} patching charts]${C_}" -patch -p0 < "${3}" +git apply "${PATCH_FILE}" echo -e "${_G}[Step $((CURR++))/${TOTAL} returning to original working directory]${C_}" popd |