From c9ea08f25a8764d2ad281faa722f03dc4fff1534 Mon Sep 17 00:00:00 2001 From: Milan Verespej Date: Wed, 6 Feb 2019 12:29:00 +0100 Subject: 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 --- build/fetch_and_patch_charts.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build/fetch_and_patch_charts.sh') 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 -- cgit