diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 15:10:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 15:10:07 +0100 |
| commit | 8ac742dcd7305a3fba553f38dbe88087e2bef6e8 (patch) | |
| tree | 25b13a41c0ad465e5bfdb6a5d4ca367a09e2bfe1 | |
| parent | 7ce89b6ecea339b751873aecd2a8e0718349da1d (diff) | |
| download | alsa-driver-build-unstable-8ac742dcd7305a3fba553f38dbe88087e2bef6e8.tar.gz | |
Drop -p0 option for patching
The recent patch refuses to patch a file with paths including
symlinks, no matter whether --follow-symlinks option is set or not.
But this seems happening only when -p option is used. So, a simple
workaround is to drop -p0 option in invocations.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rwxr-xr-x | alsa/utils/patch-alsa | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/alsa/utils/patch-alsa b/alsa/utils/patch-alsa index 32f86d1f0..9b7411baf 100755 --- a/alsa/utils/patch-alsa +++ b/alsa/utils/patch-alsa @@ -11,7 +11,7 @@ case $dst in xtmp=`dirname $dst | sed -e s@/acore@/core@ -e s@alsa-driver/@alsa-driver/alsa-kernel/@`/`basename $dst` echo copying file $xtmp cp -v $xtmp $dst || exit 1 - patch -p0 $dst $pat || { rm $dst; exit 1; } + patch $dst $pat || { rm $dst; exit 1; } ;; *) curd=`/bin/pwd` @@ -19,7 +19,7 @@ case $dst in xtmp=`echo $MODCURDIR | sed -e 's/^acore/core/'`/$dst echo copying file alsa-kernel/$xtmp cp $SND_TOPDIR/alsa-kernel/$xtmp $@ || exit 1 - patch -p0 -i $pat || { rm $dst; exit 1; } + patch -i $pat || { rm $dst; exit 1; } ;; esac exit 0 |