diff options
| author |   John Mylchreest <johnm@gentoo.org> | 2006-04-02 19:14:10 +0000 |
|---|---|---|
| committer | John Mylchreest <johnm@gentoo.org> | 2006-04-02 19:14:10 +0000 |
| commit | 70810a8635dec001521e734fed58a34c12eadd71 (patch) | |
| tree | 1ece96d8bf33b0daae51958ef8a29cd0ea03bcc8 /eclass | |
| parent | Mask upcoming vlc beta. (diff) | |
| download | historical-70810a8635dec001521e734fed58a34c12eadd71.tar.gz historical-70810a8635dec001521e734fed58a34c12eadd71.tar.bz2 historical-70810a8635dec001521e734fed58a34c12eadd71.zip | |
Fixes bug #12645 and misc.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-mod.eclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index ea7c093deb7c..16d47972137c 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.62 2006/03/26 17:47:19 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.63 2006/04/02 19:14:10 johnm Exp $ # Description: This eclass is used to interface with linux-info in such a way # to provide the functionality required and initial functions @@ -464,7 +464,8 @@ find_module_params() { linux-mod_pkg_setup() { linux-info_pkg_setup; check_kernel_built; - check_modules_supported; + strip_modulenames; + [[ -n ${MODULE_NAMES} ]] && check_modules_supported set_kvobj; # Commented out with permission from johnm until a fixed version for arches # who intentionally use different kernel and userland compilers can be @@ -472,18 +473,20 @@ linux-mod_pkg_setup() { #check_vermagic; } +strip_modulenames() { + local i + for i in ${MODULE_IGNORE}; do + MODULE_NAMES=${MODULE_NAMES//${i}(*} + done +} + linux-mod_src_compile() { local modulename libdir srcdir objdir i n myARCH="${ARCH}" myABI="${ABI}" ARCH="$(tc-arch-kernel)" ABI="${KERNEL_ABI}" BUILD_TARGETS=${BUILD_TARGETS:-clean module} - - for i in ${MODULE_IGNORE} - do - MODULE_NAMES=${MODULE_NAMES//${i}(*} - done - + strip_modulenames; for i in ${MODULE_NAMES} do unset libdir srcdir objdir @@ -520,11 +523,7 @@ linux-mod_src_compile() { linux-mod_src_install() { local modulename libdir srcdir objdir i n - for i in ${MODULE_IGNORE} - do - MODULE_NAMES=${MODULE_NAMES//${i}(*} - done - + strip_modulenames; for i in ${MODULE_NAMES} do unset libdir srcdir objdir |