|
Line
Link Here
|
| 0 |
-- a/patches/patchinstall.sh |
0 |
++ b/patches/patchinstall.sh |
|
Lines 668-673
if test "$backend" = "patch"; then
Link Here
|
| 668 |
fi |
668 |
fi |
| 669 |
} |
669 |
} |
| 670 |
|
670 |
|
|
|
671 |
# 'epatch' backend - used on Gentoo |
| 672 |
elif test "$backend" = "epatch"; then |
| 673 |
|
| 674 |
patch_apply () |
| 675 |
{ |
| 676 |
echo "cwd:$(pwd) patch:$1"; |
| 677 |
if grep -q "^GIT binary patch" "$1"; then |
| 678 |
if ! ../debian/tools/gitapply.sh -d "$DESTDIR" < "$1"; then |
| 679 |
abort "Failed to apply patch, aborting!" |
| 680 |
fi |
| 681 |
else |
| 682 |
local patch="$(readlink -f "$1")" |
| 683 |
if ! (cd "$DESTDIR" && epatch "$patch"); then |
| 684 |
abort "Failed to apply patch, aborting!" |
| 685 |
fi |
| 686 |
fi |
| 687 |
} |
| 688 |
|
| 671 |
# GIT backend - apply patches using 'git am' |
689 |
# GIT backend - apply patches using 'git am' |
| 672 |
elif test "$backend" = "git" -o "$backend" = "git-am"; then |
690 |
elif test "$backend" = "git" -o "$backend" = "git-am"; then |
|
Lines 833-840
fi
Link Here
|
| 833 |
# To make sure we find all the patches and tools switch to the patches directory now |
833 |
# To make sure we find all the patches and tools switch to the patches directory now |
| 834 |
script="$(readlink -f "$0")" |
834 |
script="$(readlink -f "$0")" |
| 835 |
curdir="$(dirname "$script")" |
835 |
curdir="$(dirname "$script")" |
| 836 |
if ! cd "$curdir"; then |
836 |
if test -f "$curdir/patchinstall.sh"; then |
| 837 |
abort "Failed to change working directory to $curdir." |
837 |
if ! cd "$curdir"; then |
|
|
838 |
abort "Failed to change working directory to $curdir." |
| 839 |
fi |
| 840 |
elif test ! -f ./patchinstall.sh; then |
| 841 |
abort "Failed to find patch directory." |
| 838 |
fi |
842 |
fi |
| 839 |
|
843 |
|
| 840 |
# If autoupdate is enabled then create a tempfile to keep track of all patches |
844 |
# If autoupdate is enabled then create a tempfile to keep track of all patches |
