Skip to content

Commit

Permalink
Use patch -p1 instead of patch -fp1
Browse files Browse the repository at this point in the history
See issue #6666.  -f is not in POSIX, and if the patch is valid, then
-p1 works just fine.
  • Loading branch information
srh committed May 21, 2018
1 parent d94d069 commit 98fd784
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions mk/support/pkg/pkg.sh
Expand Up @@ -130,7 +130,7 @@ pkg_patch () {
for patch in "$pkg_dir"/patch/"$pkg"_*.patch; do # lexical order
case "$patch" in
*_\*.patch) ;;
*) in_dir "$1" patch -fp1 < "$patch" ;;
*) in_dir "$1" patch -p1 < "$patch" ;;
esac
done
}
Expand Down Expand Up @@ -164,15 +164,6 @@ pkg_save_patch () {
pkg_remove_tmp_fetch_dir
}

pkg_patch () {
for patch in "$pkg_dir"/patch/"$pkg"_*.patch; do # lexical order
case "$patch" in
*_\*.patch) ;;
*) in_dir "$1" patch -fp1 < "$patch" ;;
esac
done
}

pkg_fetch_git () {
pkg_make_tmp_fetch_dir

Expand Down

0 comments on commit 98fd784

Please sign in to comment.