From 493809cbe486851aaf5f816540721eb97c164503 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 10 Oct 2008 04:48:58 +0200 Subject: [PATCH] Copy patch into $wrksrc before applying and use this one. Previously it was using the one in PKGFS_TEMPLATESDIR, therefore if it was compressed it was uncompressing it directly! --HG-- extra : convert_revision : 210afd8662e0f9dcb6907a4d031a3197686bbdb8 --- pkgfs.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgfs.sh b/pkgfs.sh index 4b8394a07f4..fa45f180993 100755 --- a/pkgfs.sh +++ b/pkgfs.sh @@ -221,15 +221,17 @@ apply_tmpl_patches() continue fi + $cp_cmd -f $patch $wrksrc + # Try to guess if its a compressed patch. if $(echo $patch|$grep_cmd -q .gz); then - $gunzip_cmd $patch - patch=${patch%%.gz} + $gunzip_cmd $wrksrc/$i + patch=${i%%.gz} elif $(echo $patch|$grep_cmd -q .bz2); then - $bunzip2_cmd $patch - patch=${patch%%.bz2} + $bunzip2_cmd $wrksrc/$i + patch=${i%%.bz2} elif $(echo $patch|$grep_cmd -q .diff); then - # nada + patch=$i else echo "*** WARNING: unknown patch type '$i' ***" continue