commit:     459790c8075e8152e764a9d1d070994fd5cb83b6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 03:51:52 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:06:18 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=459790c8

gen_kerncache_is_valid(): No need to do anything if $KERNCACHE file doesn't 
exist

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_package.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gen_package.sh b/gen_package.sh
index 32cbf85..bd137ad 100755
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -169,20 +169,21 @@ gen_kerncache_extract_config()
 gen_kerncache_is_valid()
 {
        KERNCACHE_IS_VALID="no"
-       if ! isTrue "${KERNEL_SOURCES}"
-       then
-               BUILD_KERNEL="no"
-               # Can make this more secure ....
 
-               /bin/tar -xf ${KERNCACHE} -C ${TEMP}
-               if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e 
${TEMP}/kernel-${ARCH}-${KV} ]
-               then
-                       print_info 1 'Valid kernel cache found; no sources will 
be used'
-                       KERNCACHE_IS_VALID="yes"
-               fi
-       else
-               if [ -e "${KERNCACHE}" ]
+       if [ -e "${KERNCACHE}" ]
+       then
+               if ! isTrue "${KERNEL_SOURCES}"
                then
+                       BUILD_KERNEL="no"
+                       # Can make this more secure ....
+
+                       /bin/tar -xf ${KERNCACHE} -C ${TEMP}
+                       if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e 
${TEMP}/kernel-${ARCH}-${KV} ]
+                       then
+                               print_info 1 'Valid kernel cache found; no 
sources will be used'
+                               KERNCACHE_IS_VALID="yes"
+                       fi
+               else
                        KERNEL_CONFIG="/${KERNEL_OUTPUTDIR}/.config"
                        if [ "${CMD_KERNEL_CONFIG}" != '' ]
                        then
@@ -208,7 +209,6 @@ gen_kerncache_is_valid()
                                fi
                                test2=$("${CONFGREP}" -v "^#" ${KERNEL_CONFIG} 
| md5sum | cut -d " " -f 1)
 
-
                                if [ "${test1}" == "${test2}" ]
                                then
                                        echo

Reply via email to