Commit 43b7f867 authored by Rabeeh Khoury's avatar Rabeeh Khoury Committed by GitHub

Merge pull request #1 from daniel-thompson/master

runme: Use --keep-cr when applying edk2-platforms patches
parents 153fb79d cf25a044
......@@ -115,7 +115,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment