diff options
author | John Mylchreest <johnm@gentoo.org> | 2004-12-06 18:33:11 +0000 |
---|---|---|
committer | John Mylchreest <johnm@gentoo.org> | 2004-12-06 18:33:11 +0000 |
commit | b920fa721ce6852e772f623b6f508fd1f149ae27 (patch) | |
tree | be41ce6f7f1e2030e7df748172c1d96cd65b4ef7 /eclass | |
parent | Version bump; cleaned up ebuild and added support for USE=doc. Marked 1.08 st... (diff) | |
download | gentoo-2-b920fa721ce6852e772f623b6f508fd1f149ae27.tar.gz gentoo-2-b920fa721ce6852e772f623b6f508fd1f149ae27.tar.bz2 gentoo-2-b920fa721ce6852e772f623b6f508fd1f149ae27.zip |
Moving get_version to linux-info pkg_setup and calling from linux-mod pkg_setup when needed.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/linux-info.eclass | 11 | ||||
-rw-r--r-- | eclass/linux-mod.eclass | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index 5b9258e144a8..09a473f2ebb0 100644 --- 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.7 2004/12/05 12:46:58 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-info.eclass,v 1.8 2004/12/06 18:33:10 johnm Exp $ # # This eclass provides functions for querying the installed kernel # source version, selected kernel options etc. @@ -8,6 +8,7 @@ ECLASS=linux-info INHERITED="$INHERITED $ECLASS" +EXPORT_FUNCTIONS pkg_setup # Overwritable environment Var's # --------------------------------------- @@ -380,3 +381,11 @@ local DEFLATE die "Kernel doesn't include zlib support" } + +################################ +# Default pkg_setup +# Also used when inheriting linux-mod to force a get_version call + +linux-info_pkg_setup() { + get_version; +} diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index 212a5b2a9005..83b1a9cd537a 100644 --- 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.5 2004/11/28 09:47:31 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.6 2004/12/06 18:33:11 johnm Exp $ # This eclass provides functions for compiling external kernel modules # from source. @@ -108,8 +108,8 @@ display_postinst() { # -------------------------------- linux-mod_pkg_setup() { - get_version; - check_kernel_built + linux-info_pkg_setup; + check_kernel_built; check_modules_supported; check_extra_config; set_kvobj; |