diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gen_compile.sh | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -2,6 +2,11 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh: + It helps if we assign the correct value to version + Send output of patch command to /dev/null + Show a message saying we're patching if there are patches for the util + 11 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> +patches/busybox/1.7.4/1.7.4-static-error.diff: Add busybox patch to remove error about compiling statically diff --git a/gen_compile.sh b/gen_compile.sh index 33377e0..d4b7c8d 100644 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -184,16 +184,17 @@ reset_args() apply_patches() { util=$1 - version=$1 + version=$2 if [ -d "${GK_SHARE}/patches/${util}/${version}" ] then + print_info 1 "${util}: >> Applying patches..." for i in "${GK_SHARE}/patches/${util}/${version}/*" do patch_success=0 for j in `seq 0 5` do - patch -p${j} -f < "${i}" + patch -p${j} --backup-if-mismatch -f < "${i}" >/dev/null if [ $? = 0 ] then patch_success=1 |