add support for CHECK_CONFIG=

diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 10fe5e05deda5e0abfb78944e8e2b22d4c24268a..2cf9d67c01cb2cc4f6562ac8d3431ef15b5167ac 100644 (file)
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.2 2004/11/25 19:47:18 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.3 2004/11/27 11:26:52 johnm Exp $
 #
 # This eclass provides functions for querying the installed kernel
 # source version, selected kernel options etc.
@@ -14,6 +14,7 @@ INHERITED="$INHERITED $ECLASS"
 KERNEL_DIR="${KERNEL_DIR:-/usr/src/linux}"
 
 
+
 # File Functions
 # ---------------------------------------
 
@@ -33,7 +34,7 @@ local ERROR
                eerror "getfilevar requires 2 variables, with the second a valid file."
                eerror "   getfilevar <VARIABLE> <CONFIGFILE>"
        else
-               grep -e "^$1" $2 | sed 's: = :=:' | cut -d= -f2-
+               grep -e "^$1[= ]" $2 | sed 's: = :=:' | cut -d= -f2-
        fi
 }
 
@@ -66,6 +67,7 @@ local RESULT
 # kernel_is 2 6                returns true
 # kernel_is 2 6 8      returns false
 # kernel_is 2 6 9      returns true
+#
 # got the jist yet?
 
 kernel_is() {
@@ -180,6 +182,43 @@ check_modules_supported() {
                eerror "These sources do not support loading external modules."
                eerror "to be able to use this module please enable \"Loadable modules support\""
                eerror "in your kernel, recompile and then try merging this module again."
+               die No support for external modules in ${KV_FUll} config
+       fi
+}
+
+check_extra_config() {
+local  config negate error
+
+       # if we haven't determined the version yet, we need too.
+       get_version;
+
+       einfo "Checking for suitable kernel configuration options"
+       for config in ${CONFIG_CHECK}
+       do
+               negate="${config:0:1}"
+               if [ "${negate}" == "!" ];
+               then
+                       config="${config:1}"
+                       if getfilevar_isset ${config} ${KV_DIR}/.config ;
+                       then
+                               eerror "  ${config}:\tshould not be set in the kernel configuration, but it is."
+                               error=1
+                       fi
+               else
+                       if ! getfilevar_isset ${config} ${KV_DIR}/.config ;
+                       then
+                               eerror "  ${config}:\tshould be set in the kernel configuration, but isn't"
+                               error=1
+                       fi
+               fi
+       done
+
+       if [ -n "${error}" ] ;
+       then
+               eerror "Please check to make sure these options are set correctly."
+               eerror "Once you have satisfied these options, please try merging"
+               eerror "this package again."
+               die Incorrect kernel configuration options
        fi
 }
 

diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass
index 26bc6e4a0d4d91f19b9f884f21fd6d925f6fac61..dff6124c6021855d215b95d828a8bcedbeed485a 100644 (file)
--- a/eclass/linux-mod.eclass
+++ b/eclass/linux-mod.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.3 2004/11/25 22:40:29 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.4 2004/11/27 11:26:52 johnm Exp $
 
 # This eclass provides functions for compiling external kernel modules
 # from source.
@@ -111,6 +111,7 @@ linux-mod_pkg_setup() {
        get_version;
        check_kernel_built
        check_modules_supported;
+       check_extra_config;
        set_kvobj;
 }