diff --git a/scripts/unpack b/scripts/unpack index 246dd148a4..66fe69e775 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -143,7 +143,11 @@ for i in $PKG_DIR/patches/$PKG_NAME-*.patch \ if [ -f "$i" ]; then printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor} $i\n" ' '>&$SILENT_OUT - cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT + if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then + cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn >&$VERBOSE_OUT + else + cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT + fi fi done