Permalink
Browse files

Fix support for applying patches in merge2out

Now allows files in subdirectories to be patched.
  • Loading branch information...
1 parent 6a8e48e commit 422eca846df0d25aab4c0942fdee395b4464f83d @woodenshoe-wi woodenshoe-wi committed Dec 26, 2016
Showing with 1 addition and 1 deletion.
  1. +1 −1 merge2out
View
@@ -196,7 +196,7 @@ if [ -d "woof-distro/${TARGETARCH}/${COMPATDISTRO}/${COMPATVERSION}/patches" ];t
`find woof-distro/${TARGETARCH}/${COMPATDISTRO}/${COMPATVERSION}/patches -mindepth 1 -maxdepth 1 -type f -iname '*.patch' | tr '\n' ' '`
do
echo " $PATCHFILE"
- patch --unified --forward --silent --input="../woof-CE/$PATCHFILE" --directory=${WOOF_OUT}
+ patch --unified --forward --silent -p 3 --input="../woof-CE/$PATCHFILE" --directory=${WOOF_OUT}
done
fi

0 comments on commit 422eca8

Please sign in to comment.