[gentoo-commits] proj/genkernel:master commit in: /

[Robin H. Johnson]

commit:     1c0c5daadb6632fa503bf980104789f74db72c7f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 06:24:42 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 06:28:16 2017 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1c0c5daa

gen_compile: be a little bit more verbose about patching.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 gen_compile.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gen_compile.sh b/gen_compile.sh
index f3f9ef1..76e11a8 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -208,17 +208,19 @@ reset_args()
 apply_patches() {
        util=$1
        version=$2
+       patchdir=${GK_SHARE}/patches/${util}/${version}
 
-       if [ -d "${GK_SHARE}/patches/${util}/${version}" ]
+       if [ -d "${patchdir}" ]
        then
                print_info 1 "${util}: >> Applying patches..."
-               for i in ${GK_SHARE}/patches/${util}/${version}/*{diff,patch}
+               for i in ${patchdir}/*{diff,patch}
                do
                        [ -f "${i}" ] || continue
                        patch_success=0
                        for j in `seq 0 5`
                        do
-                               patch -p${j} --backup-if-mismatch -f < "${i}" 
>/dev/null
+                               patch -p${j} --backup-if-mismatch -f < "${i}" 
--dry-run >/dev/null && \
+                                       patch -p${j} --backup-if-mismatch -f < 
"${i}"
                                if [ $? = 0 ]
                                then
                                        patch_success=1
@@ -232,6 +234,8 @@ apply_patches() {
                                gen_die "could not apply patch ${i} for 
${util}-${version}"
                        fi
                done
+       else
+               print_info 1 "${util}: >> No patches found in $patchdir ..."
        fi
 }