| 1 |
robbat2 10/01/17 03:54:52 |
| 2 |
|
| 3 |
Modified: linux-mod.eclass |
| 4 |
Log: |
| 5 |
Bug #286292: Try to make kernel module binpkgs NOT need kernel sources by using a different path in pkg_setup. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.97 eclass/linux-mod.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.97&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.97&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.96&r2=1.97 |
| 13 |
|
| 14 |
Index: linux-mod.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v |
| 17 |
retrieving revision 1.96 |
| 18 |
retrieving revision 1.97 |
| 19 |
diff -p -w -b -B -u -u -r1.96 -r1.97 |
| 20 |
--- linux-mod.eclass 10 Jan 2010 09:38:50 -0000 1.96 |
| 21 |
+++ linux-mod.eclass 17 Jan 2010 03:54:51 -0000 1.97 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2004 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.96 2010/01/10 09:38:50 robbat2 Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.97 2010/01/17 03:54:51 robbat2 Exp $ |
| 27 |
|
| 28 |
# Author(s): John Mylchreest <johnm@g.o>, |
| 29 |
# Stefan Schweizer <genstef@g.o> |
| 30 |
@@ -576,6 +576,12 @@ find_module_params() { |
| 31 |
linux-mod_pkg_setup() { |
| 32 |
debug-print-function ${FUNCNAME} $* |
| 33 |
|
| 34 |
+ # If we are installing a binpkg, take a different path. |
| 35 |
+ if [[ $EMERGE_FROM == binary ]]; then |
| 36 |
+ linux-mod_pkg_setup_binary |
| 37 |
+ return |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
linux-info_pkg_setup; |
| 41 |
require_configured_kernel |
| 42 |
check_kernel_built; |
| 43 |
@@ -588,6 +594,22 @@ linux-mod_pkg_setup() { |
| 44 |
#check_vermagic; |
| 45 |
} |
| 46 |
|
| 47 |
+# @FUNCTION: linux-mod_pkg_setup_binary |
| 48 |
+# @DESCRIPTION: |
| 49 |
+# Perform all kernel option checks non-fatally, as the .config and |
| 50 |
+# /proc/config.gz might not be present. Do not do anything that requires kernel |
| 51 |
+# sources. |
| 52 |
+linux-mod_pkg_setup_binary() { |
| 53 |
+ debug-print-function ${FUNCNAME} $* |
| 54 |
+ local new_CONFIG_CHECK |
| 55 |
+ for config in $CONFIG_CHECK ; do |
| 56 |
+ optional=${config:0:1} |
| 57 |
+ new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional:-~}${config}" |
| 58 |
+ done |
| 59 |
+ export CONFIG_CHECK="${new_CONFIG_CHECK}" |
| 60 |
+ linux-info_pkg_setup; |
| 61 |
+} |
| 62 |
+ |
| 63 |
strip_modulenames() { |
| 64 |
debug-print-function ${FUNCNAME} $* |
Archives