Merge branch 'master' of github.com:SolidRun/lx2160a_build

5a25d707 · Rabeeh Khoury · e25e1058 · 43b7f867 · 5a25d707
Commit 5a25d707 authored Sep 26, 2019 by Rabeeh Khoury
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

runme.sh runme.sh +1 -1

No files found.
--- a/runme.sh
+++ b/runme.sh
@@ -117,7 +117,7 @@ for i in $QORIQ_COMPONENTS; do
 			cd edk2-platforms
 			git checkout -b $RELEASE refs/tags/$RELEASE
 			patch -p1 < $ROOTDIR/patches/edk2-platforms/*.diff
-			git am $ROOTDIR/patches/edk2-platforms/*.patch
+			git am --keep-cr $ROOTDIR/patches/edk2-platforms/*.patch
 		fi
 		if [[ -d $ROOTDIR/patches/$i/ ]]; then
 			git am $ROOTDIR/patches/$i/*.patch