From: Andrew Gaffney Date: Tue, 11 Mar 2008 19:06:58 +0000 (+0000) Subject: It helps if we assign the correct value to version X-Git-Tag: v3.4.10.902~133 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ed29757efd99eff1000068eecaafd22434f97f4;p=genkernel.git 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 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@619 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- diff --git a/ChangeLog b/ChangeLog index 5011c65..5de2b97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Mar 2008; Andrew Gaffney 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 +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