Patch to compare new config instead of the one left laying around in the kerncache...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@520 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index f2d2ffc74ab5227b63d66c42cf47ff460bd118d9..54056a46b3ab7d5327ce2e65effcce4dd352bcb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_package.sh:
+  Patch to compare new config instead of the one left laying around in the
+  kerncache dir. Thanks to Pat Double <gentoo@patdouble.com> in bug #179739
+
   26 Jul 2007; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh,
   gen_initramfs.sh, gen_initrd.sh, genkernel.conf:
   Patch to actually use busybox bincache. Thanks to Pat Double

diff --git a/gen_package.sh b/gen_package.sh
index 323bb7c830baf024002168d4bb1d19eec2ff7f04..54a0984d45698f2c53e035326b7d4ba301aa5dba 100644 (file)
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -155,12 +155,18 @@ gen_kerncache_is_valid()
         else
                if [ -e "${KERNCACHE}" ] 
                then
+                       KERNEL_CONFIG="/${KERNEL_DIR}/.config"
+                       if [ "${CMD_KERNEL_CONFIG}" != '' ]
+                       then
+                               KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
+                       fi
+
                        /bin/tar -xj -f ${KERNCACHE} -C ${TEMP}
-                       if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e /${KERNEL_DIR}/.config ]
+                       if [ -e ${TEMP}/config-${ARCH}-${KV} -a -e ${KERNEL_CONFIG} ]
                        then
        
-                               test1=$(md5sum ${TEMP}/config-${ARCH}-${KV} | cut -d " " -f 1)
-                               test2=$(md5sum /${KERNEL_DIR}/.config | cut -d " " -f 1)
+                               test1=$(grep -v "^#" ${TEMP}/config-${ARCH}-${KV} | md5sum | cut -d " " -f 1)
+                               test2=$(grep -v "^#" ${KERNEL_CONFIG} | md5sum | cut -d " " -f 1)
                                if [ "${test1}" == "${test2}" ]
                                then