diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-01-17 03:54:51 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-01-17 03:54:51 +0000 |
| commit | 9bbe21786b8bccb5ea2d6cff3878bcdf3ab1465e (patch) | |
| tree | 8ca0aabccd720b6c21705541c79e5cfe21e88511 /eclass | |
| parent | Workaround eautomake weirdness #296013. (diff) | |
| download | gentoo-2-9bbe21786b8bccb5ea2d6cff3878bcdf3ab1465e.tar.gz gentoo-2-9bbe21786b8bccb5ea2d6cff3878bcdf3ab1465e.tar.bz2 gentoo-2-9bbe21786b8bccb5ea2d6cff3878bcdf3ab1465e.zip | |
Bug #286292: Try to make kernel module binpkgs NOT need kernel sources by using a different path in pkg_setup.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/linux-mod.eclass | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index 7c4aa4d25001..bcdde40210b6 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.96 2010/01/10 09:38:50 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.97 2010/01/17 03:54:51 robbat2 Exp $ # Author(s): John Mylchreest <johnm@gentoo.org>, # Stefan Schweizer <genstef@gentoo.org> @@ -576,6 +576,12 @@ find_module_params() { linux-mod_pkg_setup() { debug-print-function ${FUNCNAME} $* + # If we are installing a binpkg, take a different path. + if [[ $EMERGE_FROM == binary ]]; then + linux-mod_pkg_setup_binary + return + fi + linux-info_pkg_setup; require_configured_kernel check_kernel_built; @@ -588,6 +594,22 @@ linux-mod_pkg_setup() { #check_vermagic; } +# @FUNCTION: linux-mod_pkg_setup_binary +# @DESCRIPTION: +# Perform all kernel option checks non-fatally, as the .config and +# /proc/config.gz might not be present. Do not do anything that requires kernel +# sources. +linux-mod_pkg_setup_binary() { + debug-print-function ${FUNCNAME} $* + local new_CONFIG_CHECK + for config in $CONFIG_CHECK ; do + optional=${config:0:1} + new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional:-~}${config}" + done + export CONFIG_CHECK="${new_CONFIG_CHECK}" + linux-info_pkg_setup; +} + strip_modulenames() { debug-print-function ${FUNCNAME} $* |