[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Christian Heim (phreak)]

phreak      07/10/03 12:55:19

  Modified:             linux-mod.eclass
  Log:
  Change to ${S} before starting the module build (see #192549 with thanks to Elias Probst <mail at eliasprobst.eu>).

Revision  Changes    Path
1.76                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.75&r2=1.76

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- linux-mod.eclass	3 Oct 2007 12:53:10 -0000	1.75
+++ linux-mod.eclass	3 Oct 2007 12:55:18 -0000	1.76
@@ -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.75 2007/10/03 12:53:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.76 2007/10/03 12:55:18 phreak Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -491,6 +491,7 @@
 
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
 	strip_modulenames;
+	cd "${S}"
 	for i in ${MODULE_NAMES}
 	do
 		unset libdir srcdir objdir



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Zac Medico (zmedico)]

zmedico     07/11/16 06:12:01

  Modified:             linux-mod.eclass
  Log:
  Replace references to deprecated ${IMAGE} with equivalent ${D}.
  These seem to be the last ${IMAGE} references in the whole tree.

Revision  Changes    Path
1.77                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.76&r2=1.77

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- linux-mod.eclass	3 Oct 2007 12:55:18 -0000	1.76
+++ linux-mod.eclass	16 Nov 2007 06:12:01 -0000	1.77
@@ -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.76 2007/10/03 12:55:18 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.77 2007/11/16 06:12:01 zmedico Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -555,9 +555,9 @@
 linux-mod_pkg_preinst() {
 	debug-print-function ${FUNCNAME} $*
 
-	[ -d ${IMAGE}/lib/modules ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
-	[ -d ${IMAGE}/etc/modules.d ] && UPDATE_MODULES=true || UPDATE_MODULES=false
-	[ -d ${IMAGE}/lib/modules ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
+	[ -d "${D}lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
+	[ -d "${D}etc/modules.d" ] && UPDATE_MODULES=true || UPDATE_MODULES=false
+	[ -d "${D}lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
 }
 
 linux-mod_pkg_postinst() {



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     08/03/22 01:10:19

  Modified:             linux-mod.eclass
  Log:
  Correctly handle variables with spaces being over and under interpreted when the emake is called. Symptoms of this are weird targets being used for make.

Revision  Changes    Path
1.79                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.78&r2=1.79

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -p -w -b -B -u -u -r1.78 -r1.79
--- linux-mod.eclass	22 Jan 2008 21:05:32 -0000	1.78
+++ linux-mod.eclass	22 Mar 2008 01:10:19 -0000	1.79
@@ -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.78 2008/01/22 21:05:32 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.79 2008/03/22 01:10:19 robbat2 Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -514,9 +514,18 @@ linux-mod_src_compile() {
 				die "Unable to run econf ${ECONF_PARAMS}"
 			fi
 
-			emake HOSTCC="$(tc-getBUILD_CC)" CC="$(get-KERNEL_CC)" LDFLAGS="$(get_abi_LDFLAGS)" \
-				  ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS} \
-				|| die "Unable to make ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}."
+			# This looks messy, but it is needed to handle multiple variables
+			# being passed in the BUILD_* stuff where the variables also have
+			# spaces that must be preserved. If don't do this, then the stuff
+			# inside the variables gets used as targets for Make, which then
+			# fails.
+			eval "emake HOSTCC=\"$(tc-getBUILD_CC)\" \
+						CC=\"$(get-KERNEL_CC)\" \
+						LDFLAGS=\"$(get_abi_LDFLAGS)\" \
+						${BUILD_FIXES} \
+						${BUILD_PARAMS} \
+						${BUILD_TARGETS} " \
+				|| die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CC="$(get-KERNEL_CC)" LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}"
 			touch ${srcdir}/.built
 			cd ${OLDPWD}
 		fi



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Stefan Schweizer (genstef)]

genstef     08/04/03 14:59:00

  Modified:             linux-mod.eclass
  Log:
  Install modprobe.d instead of modules.d files for kernel-2.6, thanks Cardoe for helping

Revision  Changes    Path
1.80                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.79&r2=1.80

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- linux-mod.eclass	22 Mar 2008 01:10:19 -0000	1.79
+++ linux-mod.eclass	3 Apr 2008 14:58:59 -0000	1.80
@@ -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.79 2008/03/22 01:10:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.80 2008/04/03 14:58:59 genstef Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -57,7 +57,7 @@
 # if the libdir isnt specified, it assumes misc.
 # if the objdir isnt specified, it assumes srcdir
 
-# There is also support for automatyed modules.d file generation.
+# There is also support for automated modprobe.d/modules.d(2.4) file generation.
 # This can be explicitly enabled by setting any of the following variables.
 #
 #
@@ -404,7 +404,11 @@
 		#-----------------------------------------------------------------------
 
 		# then we install it
-		insinto /etc/modules.d
+		if kernel_is ge 2 6
+			insinto /etc/modprobe.d
+		else
+			insinto /etc/modules.d
+		fi
 		newins ${module_config} ${currm_path//*\/}
 
 		# and install any documentation we might have.



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Doug Klima (cardoe)]

cardoe      08/04/03 16:11:25

  Modified:             linux-mod.eclass
  Log:
  fix if that was missing then

Revision  Changes    Path
1.81                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.80&r2=1.81

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- linux-mod.eclass	3 Apr 2008 14:58:59 -0000	1.80
+++ linux-mod.eclass	3 Apr 2008 16:11:24 -0000	1.81
@@ -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.80 2008/04/03 14:58:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.81 2008/04/03 16:11:24 cardoe Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -404,7 +404,7 @@
 		#-----------------------------------------------------------------------
 
 		# then we install it
-		if kernel_is ge 2 6
+		if kernel_is ge 2 6; then
 			insinto /etc/modprobe.d
 		else
 			insinto /etc/modules.d



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Mike Frysinger (vapier)]

vapier      08/09/30 05:27:42

  Modified:             linux-mod.eclass
  Log:
  allow KERNEL_CC env var to override get-KERNEL_CC()

Revision  Changes    Path
1.82                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.81&r2=1.82

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- linux-mod.eclass	3 Apr 2008 16:11:24 -0000	1.81
+++ linux-mod.eclass	30 Sep 2008 05:27:42 -0000	1.82
@@ -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.81 2008/04/03 16:11:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.82 2008/09/30 05:27:42 vapier Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -258,6 +258,11 @@
 get-KERNEL_CC() {
 	debug-print-function ${FUNCNAME} $*
 
+	if [[ -n ${KERNEL_CC} ]] ; then
+		echo "${KERNEL_CC}"
+		return
+	fi
+
 	local kernel_cc
 	if [ -n "${KERNEL_ABI}" ]; then
 		# In future, an arch might want to define CC_$ABI

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Mike Frysinger (vapier)]

vapier      08/10/27 05:20:30

  Modified:             linux-mod.eclass
  Log:
  pass CROSS_COMPILE=${CHOST}- to build process #194380

Revision  Changes    Path
1.83                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.82&r2=1.83

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- linux-mod.eclass	30 Sep 2008 05:27:42 -0000	1.82
+++ linux-mod.eclass	27 Oct 2008 05:20:30 -0000	1.83
@@ -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.82 2008/09/30 05:27:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.83 2008/10/27 05:20:30 vapier Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -522,19 +522,19 @@
 				econf ${ECONF_PARAMS} || \
 				die "Unable to run econf ${ECONF_PARAMS}"
 			fi
-		
+
 			# This looks messy, but it is needed to handle multiple variables
 			# being passed in the BUILD_* stuff where the variables also have
 			# spaces that must be preserved. If don't do this, then the stuff
 			# inside the variables gets used as targets for Make, which then
 			# fails.
 			eval "emake HOSTCC=\"$(tc-getBUILD_CC)\" \
-						CC=\"$(get-KERNEL_CC)\" \
+						CROSS_COMPILE=${CHOST}- \
 						LDFLAGS=\"$(get_abi_LDFLAGS)\" \
 						${BUILD_FIXES} \
 						${BUILD_PARAMS} \
 						${BUILD_TARGETS} " \
-				|| die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CC="$(get-KERNEL_CC)" LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}"
+				|| die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CROSS_COMPILE=${CHOST}- LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}"
 			touch ${srcdir}/.built
 			cd ${OLDPWD}
 		fi

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Mike Frysinger (vapier)]

vapier      08/10/27 05:22:13

  Modified:             linux-mod.eclass
  Log:
  use set_arch_to_kernel/set_arch_to_portage rather than managing ARCH ourselves #194380

Revision  Changes    Path
1.84                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.83&r2=1.84

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- linux-mod.eclass	27 Oct 2008 05:20:30 -0000	1.83
+++ linux-mod.eclass	27 Oct 2008 05:22:13 -0000	1.84
@@ -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.83 2008/10/27 05:20:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.84 2008/10/27 05:22:13 vapier Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -495,8 +495,8 @@
 linux-mod_src_compile() {
 	debug-print-function ${FUNCNAME} $*
 
-	local modulename libdir srcdir objdir i n myARCH="${ARCH}" myABI="${ABI}"
-	ARCH="$(tc-arch-kernel)"
+	local modulename libdir srcdir objdir i n myABI="${ABI}"
+	set_arch_to_kernel
 	ABI="${KERNEL_ABI}"
 
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
@@ -540,7 +540,7 @@
 		fi
 	done
 
-	ARCH="${myARCH}"
+	set_arch_to_portage
 	ABI="${myABI}"
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Daniel Drake (dsd)]

dsd         08/10/31 21:25:56

  Modified:             linux-mod.eclass
  Log:
  add some documentation, patch from Eric Brown in bug #190934

Revision  Changes    Path
1.85                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.84&r2=1.85

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- linux-mod.eclass	27 Oct 2008 05:22:13 -0000	1.84
+++ linux-mod.eclass	31 Oct 2008 21:25:56 -0000	1.85
@@ -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.84 2008/10/27 05:22:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.85 2008/10/31 21:25:56 dsd Exp $
 
 # Description: This eclass is used to interface with linux-info in such a way
 #              to provide the functionality required and initial functions
@@ -37,6 +37,20 @@
 #
 # The structure of each MODULE_NAMES entry is as follows:
 # modulename(libdir:srcdir:objdir)
+#
+# modulename = name of the module file excluding the .ko
+# libdir     = place in system modules directory where module is installed:
+# srcdir     = place for ebuild to cd to before running make
+# objdir     = place the .ko and objects are located after make runs
+#
+# To get an idea of how these variables are used, here's a few lines
+# of code from around line 540 in this eclass:
+#		
+#	einfo "Installing ${modulename} module"
+#	cd ${objdir} || die "${objdir} does not exist"
+#	insinto /lib/modules/${KV_FULL}/${libdir}
+#	doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
+#
 # for example:
 # MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
 #

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Daniel Drake (dsd)]

dsd         08/10/31 22:24:55

  Modified:             linux-mod.eclass
  Log:
  add some fantastic documentation from Fabio Rossi in bug #217560

Revision  Changes    Path
1.86                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.85&r2=1.86

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- linux-mod.eclass	31 Oct 2008 21:25:56 -0000	1.85
+++ linux-mod.eclass	31 Oct 2008 22:24:55 -0000	1.86
@@ -1,47 +1,60 @@
 # 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.85 2008/10/31 21:25:56 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.86 2008/10/31 22:24:55 dsd Exp $
 
-# Description: This eclass is used to interface with linux-info in such a way
-#              to provide the functionality required and initial functions
-#			   required to install external modules against a kernel source
-#			   tree.
-#
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
 # Maintainer: kernel-misc@gentoo.org
 #
 # Please direct your bugs to the current eclass maintainer :)
 
+# @ECLASS: linux-mod.eclass
+# @MAINTAINER:
+# kernel-misc@gentoo.org
+# @BLURB: It provides the functionality required to install external modules against a kernel source tree.
+# @DESCRIPTION:
+# This eclass is used to interface with linux-info.eclass in such a way
+# to provide the functionality and initial functions
+# required to install external modules against a kernel source
+# tree.
+
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
-#
-# Env Var		Option		Default		Description
-# KERNEL_DIR		<string>	/usr/src/linux	The directory containing kernel
-#							the target kernel sources.
-# ECONF_PARAMS		<string>			The parameters to pass to econf.
-#							If this is not set, then econf
-#							isn't run.
-# BUILD_PARAMS		<string>			The parameters to pass to emake.
-# BUILD_TARGETS		<string>	clean modules	The build targets to pass to
-#							make.
-# MODULE_NAMES		<string>			This is the modules which are
-#							to be built automatically using
-#							the default pkg_compile/install.
-#							They are explained properly
-#							below. It will only make
-#							BUILD_TARGETS once in any
-#							directory.
 
-# MODULE_NAMES - Detailed Overview
+# @ECLASS-VARIABLE: KERNEL_DIR
+# @DESCRIPTION:
+# A string containing the directory of the target kernel sources. The default value is
+# "/usr/src/linux"
+
+# @ECLASS-VARIABLE: ECONF_PARAMS
+# @DESCRIPTION:
+# It's a string containing the parameters to pass to econf.
+# If this is not set, then econf isn't run.
+
+# @ECLASS-VARIABLE: BUILD_PARAMS
+# @DESCRIPTION:
+# It's a string with the parameters to pass to emake.
+
+# @ECLASS-VARIABLE: BUILD_TARGETS
+# @DESCRIPTION:
+# It's a string with the build targets to pass to make. The default value is "clean modules"
+
+# @ECLASS-VARIABLE: MODULE_NAMES
+# @DESCRIPTION:
+# It's a string containing the modules to be built automatically using the default
+# src_compile/src_install. It will only make ${BUILD_TARGETS} once in any directory.
+
 #
 # The structure of each MODULE_NAMES entry is as follows:
-# modulename(libdir:srcdir:objdir)
 #
-# modulename = name of the module file excluding the .ko
-# libdir     = place in system modules directory where module is installed:
-# srcdir     = place for ebuild to cd to before running make
-# objdir     = place the .ko and objects are located after make runs
+#   modulename(libdir:srcdir:objdir)
+#
+# where:
+#
+#   modulename = name of the module file excluding the .ko
+#   libdir     = place in system modules directory where module is installed:
+#   srcdir     = place for ebuild to cd to before running make
+#   objdir     = place the .ko and objects are located after make runs
 #
 # To get an idea of how these variables are used, here's a few lines
 # of code from around line 540 in this eclass:
@@ -51,47 +64,67 @@
 #	insinto /lib/modules/${KV_FULL}/${libdir}
 #	doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
 #
-# for example:
-# MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
+# For example:
+#   MODULE_NAMES="module_pci(pci:${S}/pci:${S}) module_usb(usb:${S}/usb:${S})"
 #
 # what this would do is
-#  cd ${S}/pci
-#  make ${BUILD_PARAMS} ${BUILD_TARGETS}
-#  cd ${S}
-#  insinto /lib/modules/${KV_FULL}/pci
-#  doins module_pci.${KV_OBJ}
-#
-#  cd ${S}/usb
-#  make ${BUILD_PARAMS} ${BUILD_TARGETS}
-#  cd ${S}
-#  insinto /lib/modules/${KV_FULL}/usb
-#  doins module_usb.${KV_OBJ}
-#
-# if the srcdir isnt specified, it assumes ${S}
-# if the libdir isnt specified, it assumes misc.
-# if the objdir isnt specified, it assumes srcdir
+#
+#   cd "${S}"/pci
+#   make ${BUILD_PARAMS} ${BUILD_TARGETS}
+#   cd "${S}"
+#   insinto /lib/modules/${KV_FULL}/pci
+#   doins module_pci.${KV_OBJ}
+#
+#   cd "${S}"/usb
+#   make ${BUILD_PARAMS} ${BUILD_TARGETS}
+#   cd "${S}"
+#   insinto /lib/modules/${KV_FULL}/usb
+#   doins module_usb.${KV_OBJ}
 
 # There is also support for automated modprobe.d/modules.d(2.4) file generation.
 # This can be explicitly enabled by setting any of the following variables.
+
+# @ECLASS-VARIABLE: MODULESD_<modulename>_ENABLED
+# @DESCRIPTION:
+# This is used to disable the modprobe.d/modules.d file generation otherwise the file will be
+# always generated (unless no MODULESD_<modulename>_* variable is provided). Set to "no" to disable
+# the generation of the file and the installation of the documentation.
+
+# @ECLASS-VARIABLE: MODULESD_<modulename>_EXAMPLES
+# @DESCRIPTION:
+# This is a bash array containing a list of examples which should
+# be used. If you want us to try and take a guess set this to "guess".
+#
+# For each array_component it's added an options line in the modprobe.d/modules.d file
+#
+#   options array_component
+#
+# where array_component is "<modulename> options" (see modprobe.conf(5))
+
+# @ECLASS-VARIABLE: MODULESD_<modulename>_ALIASES
+# @DESCRIPTION:
+# This is a bash array containing a list of associated aliases.
+#
+# For each array_component it's added an alias line in the modprobe.d/modules.d file
 #
+#   alias array_component
 #
-# MODULESD_${modulename}_ENABLED		This enables the modules.d file
-#						generation even if we dont
-#						specify any additional info.
-# MODULESD_${modulename}_EXAMPLES		This is a bash array containing
-#						a list of examples which should
-#						be used. If you want us to try and
-#						take a guess. Set this to "guess"
-# MODULESD_${modulename}_ALIASES		This is a bash array containing
-#						a list of associated aliases.
-# MODULESD_${modulename}_ADDITIONS		This is a bash array containing
-#						A list of additional things to
-#						add to the bottom of the file.
-#						This can be absolutely anything.
-#						Each entry is a new line.
-# MODULES_${modulename}_DOCS			This is a string list which contains
-#						the full path to any associated
-#						documents for $modulename
+# where array_component is "wildcard <modulename>" (see modprobe.conf(5))
+
+# @ECLASS-VARIABLE: MODULESD_<modulename>_ADDITIONS
+# @DESCRIPTION:
+# This is a bash array containing a list of additional things to
+# add to the bottom of the file. This can be absolutely anything.
+# Each entry is a new line.
+
+# @ECLASS-VARIABLE: MODULESD_<modulename>_DOCS
+# @DESCRIPTION:
+# This is a string list which contains the full path to any associated
+# documents for <modulename>. These files are installed in the live tree.
+
+# @ECLASS-VARIABLE: KV_OBJ
+# @DESCRIPTION:
+# It's a read-only variable. It contains the extension of the kernel modules.
 
 # The order of these is important as both of linux-info and eutils contain
 # set_arch_to_kernel and set_arch_to_portage functions and the ones in eutils
@@ -150,6 +183,10 @@
 	fi
 }
 
+# @FUNCTION: use_m
+# @RETURN: true or false
+# @DESCRIPTION:
+# It checks if the kernel version is greater than 2.6.5.
 use_m() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -162,6 +199,10 @@
 		return 0 || return 1
 }
 
+# @FUNCTION: convert_to_m
+# @USAGE: /path/to/the/file
+# @DESCRIPTION:
+# It converts a file (e.g. a makefile) to use M= instead of SUBDIRS=
 convert_to_m() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -175,6 +216,11 @@
 	fi
 }
 
+# internal function
+#
+# FUNCTION: update_depmod
+# DESCRIPTION:
+# It updates the modules.dep file for the current kernel.
 update_depmod() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -195,6 +241,11 @@
 	fi
 }
 
+# internal function
+#
+# FUNCTION: update_modules
+# DESCRIPTION:
+# It calls the update-modules utility.
 update_modules() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -211,6 +262,11 @@
 	fi
 }
 
+# internal function
+#
+# FUNCTION: move_old_moduledb
+# DESCRIPTION:
+# It updates the location of the database used by the module-rebuild utility.
 move_old_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -226,6 +282,11 @@
 	fi
 }
 
+# internal function
+#
+# FUNCTION: update_moduledb
+# DESCRIPTION:
+# It adds the package to the /var/lib/module-rebuild/moduledb database used by the module-rebuild utility.
 update_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -243,6 +304,12 @@
 	fi
 }
 
+# internal function
+#
+# FUNCTION: remove_moduledb
+# DESCRIPTION:
+# It removes the package from the /var/lib/module-rebuild/moduledb database used by
+# the module-rebuild utility.
 remove_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -255,6 +322,9 @@
 	fi
 }
 
+# @FUNCTION: set_kvobj
+# @DESCRIPTION:
+# It sets the KV_OBJ variable.
 set_kvobj() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -289,12 +359,21 @@
 	echo "${kernel_cc}"
 }
 
+# internal function
+#
+# FUNCTION:
+# USAGE: /path/to/the/modulename_without_extension
+# RETURN: A file in /etc/modules.d/ (kernel < 2.6) or /etc/modprobe.d/ (kernel >= 2.6)
+# DESCRIPTION:
+# This function will generate and install the neccessary modprobe.d/modules.d file from the
+# information contained in the modules exported parms.
+# (see the variables MODULESD_<modulename>_ENABLED, MODULESD_<modulename>_EXAMPLES,
+# MODULESD_<modulename>_ALIASES, MODULESD_<modulename>_ADDITION and MODULESD_<modulename>_DOCS).
+#
+# At the end the documentation specified with MODULESD_<modulename>_DOCS is installed.
 generate_modulesd() {
 	debug-print-function ${FUNCNAME} $*
 
-	# This function will generate the neccessary modules.d file from the
-	# information contained in the modules exported parms
-
 	local 	currm_path currm currm_t t myIFS myVAR
 	local 	module_docs module_enabled module_aliases \
 			module_additions module_examples module_modinfo module_opts
@@ -437,6 +516,13 @@
 	return 0
 }
 
+# internal function
+#
+# FUNCTION: find_module_params
+# USAGE: A string "NAME(LIBDIR:SRCDIR:OBJDIR)"
+# RETURN: The string "modulename:NAME libdir:LIBDIR srcdir:SRCDIR objdir:OBJDIR"
+# DESCRIPTION:
+# Analyze the specification NAME(LIBDIR:SRCDIR:OBJDIR) of one module as described in MODULE_NAMES.
 find_module_params() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -482,6 +568,11 @@
 # default ebuild functions
 # --------------------------------
 
+# @FUNCTION: linux-mod_pkg_setup
+# @DESCRIPTION:
+# It checks the CONFIG_CHECK options (see linux-info.eclass(5)), verifies that the kernel is
+# configured, verifies that the sources are prepared, verifies that the modules support is builtin
+# in the kernel and sets the object extension KV_OBJ.
 linux-mod_pkg_setup() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -506,6 +597,14 @@
 	done
 }
 
+# @FUNCTION: linux-mod_src_compile
+# @DESCRIPTION:
+# It compiles all the modules specified in MODULE_NAMES. For each module the econf command is
+# executed only if ECONF_PARAMS is defined, the name of the target is specified by BUILD_TARGETS
+# while the options are in BUILD_PARAMS (all the modules share these variables). The compilation
+# happens inside ${srcdir}.
+#
+# Look at the description of these variables for more details.
 linux-mod_src_compile() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -558,6 +657,17 @@
 	ABI="${myABI}"
 }
 
+# @FUNCTION: linux-mod_src_install
+# @DESCRIPTION:
+# It install the modules specified in MODULES_NAME. The modules should be inside the ${objdir}
+# directory and they are installed inside /lib/modules/${KV_FULL}/${libdir}.
+#
+# The modprobe.d/modules.d configuration file is automatically generated if the
+# MODULESD_<modulename>_* variables are defined. The only way to stop this process is by
+# setting MODULESD_<modulename>_ENABLED=no. At the end the documentation specified via
+# MODULESD_<modulename>_DOCS is also installed.
+#
+# Look at the description of these variables for more details.
 linux-mod_src_install() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -585,6 +695,9 @@
 	done
 }
 
+# @FUNCTION: linux-mod_pkg_preinst
+# @DESCRIPTION:
+# It checks what to do after having merged the package.
 linux-mod_pkg_preinst() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -593,6 +706,11 @@
 	[ -d "${D}lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
 }
 
+# @FUNCTION: linux-mod_pkg_postinst
+# @DESCRIPTION:
+# It executes /sbin/depmod and adds the package to the /var/lib/module-rebuild/moduledb
+# database (if ${D}/lib/modules is created) and it runs /sbin/update-modules
+# (if ${D}/etc/modules.d is created).
 linux-mod_pkg_postinst() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -601,6 +719,10 @@
 	${UPDATE_MODULEDB} && update_moduledb;
 }
 
+# @FUNCTION: linux-mod_pkg_postrm
+# @DESCRIPTION:
+# It removes the package from the /var/lib/module-rebuild/moduledb database but it doens't
+# call /sbin/depmod and /sbin/update-modules because the modules are still installed.
 linux-mod_pkg_postrm() {
 	debug-print-function ${FUNCNAME} $*
 	remove_moduledb;

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Daniel Drake (dsd)]

dsd         08/10/31 22:31:09

  Modified:             linux-mod.eclass
  Log:
  allow for relative srcdir directory, thanks to Alon Bar-Lev in bug #198642

Revision  Changes    Path
1.87                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.86&r2=1.87

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- linux-mod.eclass	31 Oct 2008 22:24:55 -0000	1.86
+++ linux-mod.eclass	31 Oct 2008 22:31:09 -0000	1.87
@@ -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.86 2008/10/31 22:24:55 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.87 2008/10/31 22:31:09 dsd Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -648,8 +648,8 @@
 						${BUILD_PARAMS} \
 						${BUILD_TARGETS} " \
 				|| die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CROSS_COMPILE=${CHOST}- LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}"
-			touch ${srcdir}/.built
 			cd ${OLDPWD}
+			touch ${srcdir}/.built
 		fi
 	done
 

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Gordon Malm (gengor)]

gengor      08/10/31 23:37:06

  Modified:             linux-mod.eclass
  Log:
  Add distcc to RESTRICT in linux-mod.eclass bug #167844

Revision  Changes    Path
1.88                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.87&r2=1.88

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- linux-mod.eclass	31 Oct 2008 22:31:09 -0000	1.87
+++ linux-mod.eclass	31 Oct 2008 23:37:06 -0000	1.88
@@ -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.87 2008/10/31 22:31:09 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.88 2008/10/31 23:37:06 gengor Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -137,6 +137,7 @@
 IUSE="kernel_linux"
 SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
+RESTRICT="distcc"
 RDEPEND="kernel_linux? ( virtual/modutils )"
 DEPEND="${RDEPEND}
 	sys-apps/sed"

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Gordon Malm (gengor)]

gengor      08/10/31 23:43:48

  Modified:             linux-mod.eclass
  Log:
  Forgot to add a comment to the eclass for commit: Add distcc to RESTRICT in linux-mod.eclass bug #167844

Revision  Changes    Path
1.89                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.89&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.89&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.88&r2=1.89

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- linux-mod.eclass	31 Oct 2008 23:37:06 -0000	1.88
+++ linux-mod.eclass	31 Oct 2008 23:43:48 -0000	1.89
@@ -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.88 2008/10/31 23:37:06 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.89 2008/10/31 23:43:48 gengor Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -137,6 +137,7 @@
 IUSE="kernel_linux"
 SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
+# Restrict distributed compile of kernel modules bug #167844
 RESTRICT="distcc"
 RDEPEND="kernel_linux? ( virtual/modutils )"
 DEPEND="${RDEPEND}

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Gordon Malm (gengor)]

gengor      08/11/01 14:56:59

  Modified:             linux-mod.eclass
  Log:
  Add bug #120001 to comment for RESTRICT=distcc

Revision  Changes    Path
1.90                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.89&r2=1.90

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- linux-mod.eclass	31 Oct 2008 23:43:48 -0000	1.89
+++ linux-mod.eclass	1 Nov 2008 14:56:59 -0000	1.90
@@ -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.89 2008/10/31 23:43:48 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.90 2008/11/01 14:56:59 gengor Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -137,7 +137,7 @@
 IUSE="kernel_linux"
 SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
-# Restrict distributed compile of kernel modules bug #167844
+# Restrict distributed compile of kernel modules bugs #120001, #167844
 RESTRICT="distcc"
 RDEPEND="kernel_linux? ( virtual/modutils )"
 DEPEND="${RDEPEND}

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Daniel Drake (dsd)]

dsd         08/11/01 23:19:15

  Modified:             linux-mod.eclass
  Log:
  documentation tweaks from Fabio Rossi

Revision  Changes    Path
1.91                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.90&r2=1.91

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- linux-mod.eclass	1 Nov 2008 14:56:59 -0000	1.90
+++ linux-mod.eclass	1 Nov 2008 23:19:15 -0000	1.91
@@ -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.90 2008/11/01 14:56:59 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.91 2008/11/01 23:19:15 dsd Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -43,7 +43,6 @@
 # @DESCRIPTION:
 # It's a string containing the modules to be built automatically using the default
 # src_compile/src_install. It will only make ${BUILD_TARGETS} once in any directory.
-
 #
 # The structure of each MODULE_NAMES entry is as follows:
 #
@@ -52,9 +51,9 @@
 # where:
 #
 #   modulename = name of the module file excluding the .ko
-#   libdir     = place in system modules directory where module is installed:
-#   srcdir     = place for ebuild to cd to before running make
-#   objdir     = place the .ko and objects are located after make runs
+#   libdir     = place in system modules directory where module is installed (by default it's misc)
+#   srcdir     = place for ebuild to cd to before running make (by default it's ${S})
+#   objdir     = place the .ko and objects are located after make runs (by default it's set to srcdir)
 #
 # To get an idea of how these variables are used, here's a few lines
 # of code from around line 540 in this eclass:

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Gordon Malm (gengor)]

gengor      08/11/02 03:02:53

  Modified:             linux-mod.eclass
  Log:
  Remove RESTRICT=distcc for now, its obvious it will never be an option when a 3rd party decides what goes in our PMS.

Revision  Changes    Path
1.92                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.91&r2=1.92

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- linux-mod.eclass	1 Nov 2008 23:19:15 -0000	1.91
+++ linux-mod.eclass	2 Nov 2008 03:02:53 -0000	1.92
@@ -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.91 2008/11/01 23:19:15 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.92 2008/11/02 03:02:53 gengor Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -136,8 +136,6 @@
 IUSE="kernel_linux"
 SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
-# Restrict distributed compile of kernel modules bugs #120001, #167844
-RESTRICT="distcc"
 RDEPEND="kernel_linux? ( virtual/modutils )"
 DEPEND="${RDEPEND}
 	sys-apps/sed"

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Daniel Drake (dsd)]

dsd         08/11/05 12:00:20

  Modified:             linux-mod.eclass
  Log:
  share Module.symvers between all compiled modules, patch from Peter Volkov in bug #237618

Revision  Changes    Path
1.93                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.92&r2=1.93

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- linux-mod.eclass	2 Nov 2008 03:02:53 -0000	1.92
+++ linux-mod.eclass	5 Nov 2008 12:00:19 -0000	1.93
@@ -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.92 2008/11/02 03:02:53 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.93 2008/11/05 12:00:19 dsd Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -614,6 +614,7 @@
 	BUILD_TARGETS=${BUILD_TARGETS:-clean module}
 	strip_modulenames;
 	cd "${S}"
+	touch Module.symvers
 	for i in ${MODULE_NAMES}
 	do
 		unset libdir srcdir objdir
@@ -628,6 +629,7 @@
 		if [ ! -f "${srcdir}/.built" ];
 		then
 			cd ${srcdir}
+			ln -s "${S}"/Module.symvers Module.symvers
 			einfo "Preparing ${modulename} module"
 			if [[ -n ${ECONF_PARAMS} ]]
 			then

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Mike Pagano (mpagano)]

mpagano     09/07/15 17:21:11

  Modified:             linux-mod.eclass
  Log:
  Name module configuration files properly as per bug #277835. Thanks to MATSUU Takuto for the patch

Revision  Changes    Path
1.94                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.93&r2=1.94

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- linux-mod.eclass	5 Nov 2008 12:00:19 -0000	1.93
+++ linux-mod.eclass	15 Jul 2009 17:21:11 -0000	1.94
@@ -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.93 2008/11/05 12:00:19 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.94 2009/07/15 17:21:11 mpagano Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -506,7 +506,7 @@
 		else
 			insinto /etc/modules.d
 		fi
-		newins ${module_config} ${currm_path//*\/}
+		newins ${module_config} ${currm_path//*\/}.conf
 
 		# and install any documentation we might have.
 		[[ -n ${module_docs} ]] && dodoc ${module_docs}

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/01/10 09:38:50

  Modified:             linux-mod.eclass
  Log:
  Bug #258209: Fix quoting of directories.

Revision  Changes    Path
1.96                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.95&r2=1.96

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -p -w -b -B -u -u -r1.95 -r1.96
--- linux-mod.eclass	6 Sep 2009 23:16:37 -0000	1.95
+++ linux-mod.eclass	10 Jan 2010 09:38:50 -0000	1.96
@@ -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.95 2009/09/06 23:16:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.96 2010/01/10 09:38:50 robbat2 Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -150,7 +150,7 @@ check_vermagic() {
 	local curr_gcc_ver=$(gcc -dumpversion)
 	local tmpfile old_chost old_gcc_ver result=0
 
-	tmpfile=`find ${KV_DIR}/ -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit`
+	tmpfile=`find "${KV_DIR}/" -iname "*.o.cmd" -exec grep usr/lib/gcc {} \; -quit`
 	tmpfile=${tmpfile//*usr/lib}
 	tmpfile=${tmpfile//\/include*}
 	old_chost=${tmpfile//*gcc\/}
@@ -211,7 +211,7 @@ convert_to_m() {
 		[ ! -f "${1}" ] && \
 			die "convert_to_m() requires a filename as an argument"
 		ebegin "Converting ${1/${WORKDIR}\//} to use M= instead of SUBDIRS="
-		sed -i 's:SUBDIRS=:M=:g' ${1}
+		sed -i 's:SUBDIRS=:M=:g' "${1}"
 		eend $?
 	fi
 }
@@ -228,9 +228,9 @@ update_depmod() {
 	get_version;
 
 	ebegin "Updating module dependencies for ${KV_FULL}"
-	if [ -r ${KV_OUT_DIR}/System.map ]
+	if [ -r "${KV_OUT_DIR}"/System.map ]
 	then
-		depmod -ae -F ${KV_OUT_DIR}/System.map -b ${ROOT} -r ${KV_FULL}
+		depmod -ae -F "${KV_OUT_DIR}"/System.map -b "${ROOT}" -r ${KV_FULL}
 		eend $?
 	else
 		ewarn
@@ -250,12 +250,12 @@ update_modules() {
 	debug-print-function ${FUNCNAME} $*
 
 	if [ -x /sbin/update-modules ] && \
-		grep -v -e "^#" -e "^$" ${D}/etc/modules.d/* >/dev/null 2>&1; then
+		grep -v -e "^#" -e "^$" "${D}"/etc/modules.d/* >/dev/null 2>&1; then
 		ebegin "Updating modules.conf"
 		/sbin/update-modules
 		eend $?
 	elif [ -x /sbin/update-modules ] && \
-		grep -v -e "^#" -e "^$" ${D}/etc/modules.d/* >/dev/null 2>&1; then
+		grep -v -e "^#" -e "^$" "${D}"/etc/modules.d/* >/dev/null 2>&1; then
 		ebegin "Updating modules.conf"
 		/sbin/update-modules
 		eend $?
@@ -270,15 +270,15 @@ update_modules() {
 move_old_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local OLDDIR=${ROOT}/usr/share/module-rebuild/
-	local NEWDIR=${ROOT}/var/lib/module-rebuild/
+	local OLDDIR="${ROOT}"/usr/share/module-rebuild/
+	local NEWDIR="${ROOT}"/var/lib/module-rebuild/
 
-	if [[ -f ${OLDDIR}/moduledb ]]; then
-		[[ ! -d ${NEWDIR} ]] && mkdir -p ${NEWDIR}
-		[[ ! -f ${NEWDIR}/moduledb ]] && \
-			mv ${OLDDIR}/moduledb ${NEWDIR}/moduledb
-		rm -f ${OLDDIR}/*
-		rmdir ${OLDDIR}
+	if [[ -f "${OLDDIR}"/moduledb ]]; then
+		[[ ! -d "${NEWDIR}" ]] && mkdir -p "${NEWDIR}"
+		[[ ! -f "${NEWDIR}"/moduledb ]] && \
+			mv "${OLDDIR}"/moduledb "${NEWDIR}"/moduledb
+		rm -f "${OLDDIR}"/*
+		rmdir "${OLDDIR}"
 	fi
 }
 
@@ -290,17 +290,17 @@ move_old_moduledb() {
 update_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
+	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/
 	move_old_moduledb
 
-	if [[ ! -f ${MODULEDB_DIR}/moduledb ]]; then
-		[[ ! -d ${MODULEDB_DIR} ]] && mkdir -p ${MODULEDB_DIR}
-		touch ${MODULEDB_DIR}/moduledb
+	if [[ ! -f "${MODULEDB_DIR}"/moduledb ]]; then
+		[[ ! -d "${MODULEDB_DIR}" ]] && mkdir -p "${MODULEDB_DIR}"
+		touch "${MODULEDB_DIR}"/moduledb
 	fi
 
-	if ! grep -qs ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb ; then
+	if ! grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then
 		einfo "Adding module to moduledb."
-		echo "a:1:${CATEGORY}/${PN}-${PVR}" >> ${MODULEDB_DIR}/moduledb
+		echo "a:1:${CATEGORY}/${PN}-${PVR}" >> "${MODULEDB_DIR}"/moduledb
 	fi
 }
 
@@ -313,12 +313,12 @@ update_moduledb() {
 remove_moduledb() {
 	debug-print-function ${FUNCNAME} $*
 
-	local MODULEDB_DIR=${ROOT}/var/lib/module-rebuild/
+	local MODULEDB_DIR="${ROOT}"/var/lib/module-rebuild/
 	move_old_moduledb
 
-	if grep -qs ${CATEGORY}/${PN}-${PVR} ${MODULEDB_DIR}/moduledb ; then
+	if grep -qs ${CATEGORY}/${PN}-${PVR} "${MODULEDB_DIR}"/moduledb ; then
 		einfo "Removing ${CATEGORY}/${PN}-${PVR} from moduledb."
-		sed -i -e "/.*${CATEGORY}\/${PN}-${PVR}.*/d" ${MODULEDB_DIR}/moduledb
+		sed -i -e "/.*${CATEGORY}\/${PN}-${PVR}.*/d" "${MODULEDB_DIR}"/moduledb
 	fi
 }
 
@@ -416,36 +416,36 @@ generate_modulesd() {
 
 		ebegin "Preparing file for modules.d"
 		#-----------------------------------------------------------------------
-		echo "# modules.d configuration file for ${currm}" >> ${module_config}
+		echo "# modules.d configuration file for ${currm}" >> "${module_config}"
 		#-----------------------------------------------------------------------
 		[[ -n ${module_docs} ]] && \
-			echo "# For more information please read:" >> ${module_config}
+			echo "# For more information please read:" >> "${module_config}"
 		for t in ${module_docs}
 		do
-			echo "#    ${t//*\/}" >> ${module_config}
+			echo "#    ${t//*\/}" >> "${module_config}"
 		done
-		echo >> ${module_config}
+		echo >> "${module_config}"
 
 		#-----------------------------------------------------------------------
 		if [[ ${module_aliases} -gt 0 ]]
 		then
-			echo  "# Internal Aliases - Do not edit" >> ${module_config}
-			echo  "# ------------------------------" >> ${module_config}
+			echo  "# Internal Aliases - Do not edit" >> "${module_config}"
+			echo  "# ------------------------------" >> "${module_config}"
 
 			for((t=0; t<${module_aliases}; t++))
 			do
 				echo "alias $(eval echo \${MODULESD_${currm}_ALIASES[$t]})" \
-					>> ${module_config}
+					>> "${module_config}"
 			done
-			echo '' >> ${module_config}
+			echo '' >> "${module_config}"
 		fi
 
 		#-----------------------------------------------------------------------
 		if [[ -n ${module_modinfo} ]]
 		then
-			echo >> ${module_config}
-			echo  "# Configurable module parameters" >> ${module_config}
-			echo  "# ------------------------------" >> ${module_config}
+			echo >> "${module_config}"
+			echo  "# Configurable module parameters" >> "${module_config}"
+			echo  "# ------------------------------" >> "${module_config}"
 			myIFS="${IFS}"
 			IFS="$(echo -en "\n\b")"
 
@@ -456,10 +456,10 @@ generate_modulesd() {
 				then
 					module_opts="${module_opts} ${t%%:*}:${myVAR}"
 				fi
-				echo -e "# ${t%%:*}:\t${t#*:}" >> ${module_config}
+				echo -e "# ${t%%:*}:\t${t#*:}" >> "${module_config}"
 			done
 			IFS="${myIFS}"
-			echo '' >> ${module_config}
+			echo '' >> "${module_config}"
 		fi
 
 		#-----------------------------------------------------------------------
@@ -468,24 +468,24 @@ generate_modulesd() {
 			# So lets do some guesswork eh?
 			if [[ -n ${module_opts} ]]
 			then
-				echo "# For Example..." >> ${module_config}
-				echo "# --------------" >> ${module_config}
+				echo "# For Example..." >> "${module_config}"
+				echo "# --------------" >> "${module_config}"
 				for t in ${module_opts}
 				do
-					echo "# options ${currm} ${t//:*}=${t//*:}" >> ${module_config}
+					echo "# options ${currm} ${t//:*}=${t//*:}" >> "${module_config}"
 				done
-				echo '' >> ${module_config}
+				echo '' >> "${module_config}"
 			fi
 		elif [[ ${module_examples} -gt 0 ]]
 		then
-			echo "# For Example..." >> ${module_config}
-			echo "# --------------" >> ${module_config}
+			echo "# For Example..." >> "${module_config}"
+			echo "# --------------" >> "${module_config}"
 			for((t=0; t<${module_examples}; t++))
 			do
 				echo "options $(eval echo \${MODULESD_${currm}_EXAMPLES[$t]})" \
-					>> ${module_config}
+					>> "${module_config}"
 			done
-			echo '' >> ${module_config}
+			echo '' >> "${module_config}"
 		fi
 
 		#-----------------------------------------------------------------------
@@ -494,9 +494,9 @@ generate_modulesd() {
 			for((t=0; t<${module_additions}; t++))
 			do
 				echo "$(eval echo \${MODULESD_${currm}_ADDITIONS[$t]})" \
-					>> ${module_config}
+					>> "${module_config}"
 			done
-			echo '' >> ${module_config}
+			echo '' >> "${module_config}"
 		fi
 
 		#-----------------------------------------------------------------------
@@ -507,7 +507,7 @@ generate_modulesd() {
 		else
 			insinto /etc/modules.d
 		fi
-		newins ${module_config} ${currm_path//*\/}.conf
+		newins "${module_config}" "${currm_path//*\/}.conf"
 
 		# and install any documentation we might have.
 		[[ -n ${module_docs} ]] && dodoc ${module_docs}
@@ -629,7 +629,7 @@ linux-mod_src_compile() {
 
 		if [ ! -f "${srcdir}/.built" ];
 		then
-			cd ${srcdir}
+			cd "${srcdir}"
 			ln -s "${S}"/Module.symvers Module.symvers
 			einfo "Preparing ${modulename} module"
 			if [[ -n ${ECONF_PARAMS} ]]
@@ -650,8 +650,8 @@ linux-mod_src_compile() {
 						${BUILD_PARAMS} \
 						${BUILD_TARGETS} " \
 				|| die "Unable to emake HOSTCC="$(tc-getBUILD_CC)" CROSS_COMPILE=${CHOST}- LDFLAGS="$(get_abi_LDFLAGS)" ${BUILD_FIXES} ${BUILD_PARAMS} ${BUILD_TARGETS}"
-			cd ${OLDPWD}
-			touch ${srcdir}/.built
+			cd "${OLDPWD}"
+			touch "${srcdir}"/.built
 		fi
 	done
 
@@ -688,12 +688,12 @@ linux-mod_src_install() {
 		objdir=${objdir:-${srcdir}}
 
 		einfo "Installing ${modulename} module"
-		cd ${objdir} || die "${objdir} does not exist"
+		cd "${objdir}" || die "${objdir} does not exist"
 		insinto /lib/modules/${KV_FULL}/${libdir}
 		doins ${modulename}.${KV_OBJ} || die "doins ${modulename}.${KV_OBJ} failed"
-		cd ${OLDPWD}
+		cd "${OLDPWD}"
 
-		generate_modulesd ${objdir}/${modulename}
+		generate_modulesd "${objdir}/${modulename}"
 	done
 }
 

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/01/17 03:54:52

  Modified:             linux-mod.eclass
  Log:
  Bug #286292: Try to make kernel module binpkgs NOT need kernel sources by using a different path in pkg_setup.

Revision  Changes    Path
1.97                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.96&r2=1.97

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -p -w -b -B -u -u -r1.96 -r1.97
--- linux-mod.eclass	10 Jan 2010 09:38:50 -0000	1.96
+++ linux-mod.eclass	17 Jan 2010 03:54:51 -0000	1.97
@@ -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} $*
 

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/01/17 04:00:08

  Modified:             linux-mod.eclass
  Log:
  Better version of the logic for bug #286292.

Revision  Changes    Path
1.98                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.97&r2=1.98

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -p -w -b -B -u -u -r1.97 -r1.98
--- linux-mod.eclass	17 Jan 2010 03:54:51 -0000	1.97
+++ linux-mod.eclass	17 Jan 2010 04:00:07 -0000	1.98
@@ -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.97 2010/01/17 03:54:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.98 2010/01/17 04:00:07 robbat2 Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -603,8 +603,11 @@ 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}"
+		case ${config:0:1} in
+			~) optional="" ;;
+			*) optional="~" ;;
+		esac
+		new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional}${config}"
 	done
 	export CONFIG_CHECK="${new_CONFIG_CHECK}"
 	linux-info_pkg_setup;

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/03/31 19:33:16

  Modified:             linux-mod.eclass
  Log:
  Bug #312075: The ~ was getting expanded to the optional stuff got duplicated and that sucked, giving a bad warning sometimes.

Revision  Changes    Path
1.99                 eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/linux-mod.eclass?r1=1.98&r2=1.99

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -p -w -b -B -u -u -r1.98 -r1.99
--- linux-mod.eclass	17 Jan 2010 04:00:07 -0000	1.98
+++ linux-mod.eclass	31 Mar 2010 19:33:16 -0000	1.99
@@ -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.98 2010/01/17 04:00:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.99 2010/03/31 19:33:16 robbat2 Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -602,11 +602,10 @@ linux-mod_pkg_setup() {
 linux-mod_pkg_setup_binary() {
 	debug-print-function ${FUNCNAME} $*
 	local new_CONFIG_CHECK
+	# ~ needs always to be quoted, else bash expands it.	
 	for config in $CONFIG_CHECK ; do
-		case ${config:0:1} in
-			~) optional="" ;;
-			*) optional="~" ;;
-		esac
+		optional='~'
+		[[ ${config:0:1} == "~" ]] && optional=''
 		new_CONFIG_CHECK="${new_CONFIG_CHECK} ${optional}${config}"
 	done
 	export CONFIG_CHECK="${new_CONFIG_CHECK}"

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Ulrich Mueller (ulm)]

ulm         11/04/24 18:55:20

  Modified:             linux-mod.eclass
  Log:
  Replace dependency on virtual/modutils, bug 358891. Whitespace.

Revision  Changes    Path
1.100                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.99&r2=1.100

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- linux-mod.eclass	31 Mar 2010 19:33:16 -0000	1.99
+++ linux-mod.eclass	24 Apr 2011 18:55:20 -0000	1.100
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.99 2010/03/31 19:33:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.100 2011/04/24 18:55:20 ulm Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -57,7 +57,7 @@
 #
 # To get an idea of how these variables are used, here's a few lines
 # of code from around line 540 in this eclass:
-#		
+#
 #	einfo "Installing ${modulename} module"
 #	cd ${objdir} || die "${objdir} does not exist"
 #	insinto /lib/modules/${KV_FULL}/${libdir}
@@ -136,7 +136,7 @@
 IUSE="kernel_linux"
 SLOT="0"
 DESCRIPTION="Based on the $ECLASS eclass"
-RDEPEND="kernel_linux? ( virtual/modutils )"
+RDEPEND="kernel_linux? ( sys-apps/module-init-tools )"
 DEPEND="${RDEPEND}
 	sys-apps/sed
 	kernel_linux? ( virtual/linux-sources )"
@@ -602,7 +602,7 @@
 linux-mod_pkg_setup_binary() {
 	debug-print-function ${FUNCNAME} $*
 	local new_CONFIG_CHECK
-	# ~ needs always to be quoted, else bash expands it.	
+	# ~ needs always to be quoted, else bash expands it.
 	for config in $CONFIG_CHECK ; do
 		optional='~'
 		[[ ${config:0:1} == "~" ]] && optional=''

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Brian Harring (ferringb)]

ferringb    11/05/27 09:46:14

  Modified:             linux-mod.eclass
  Log:
  for EAPI>=4, rely on PMS MERGE_TYPE rather than portage non-spec EMERGE_FROM; for EAPI<4, use EMERGE_FROM since it's acceptable there

Revision  Changes    Path
1.101                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.100&r2=1.101

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- linux-mod.eclass	24 Apr 2011 18:55:20 -0000	1.100
+++ linux-mod.eclass	27 May 2011 09:46:14 -0000	1.101
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.100 2011/04/24 18:55:20 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.101 2011/05/27 09:46:14 ferringb Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -576,8 +576,15 @@
 linux-mod_pkg_setup() {
 	debug-print-function ${FUNCNAME} $*
 
+	local is_bin="${MERGE_TYPE}"
+
 	# If we are installing a binpkg, take a different path.
-	if [[ $EMERGE_FROM == binary ]]; then
+	# use MERGE_TYPE if available (eapi>=4); else use non-PMS EMERGE_FROM (eapi<4)
+	if has ${EAPI} 0 1 2 3; then
+		is_bin=${EMERGE_FROM}
+	fi
+
+	if [[ ${is_bin} == binary ]]; then
 		linux-mod_pkg_setup_binary
 		return
 	fi

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Robin H. Johnson (robbat2)]

robbat2     11/06/01 06:51:30

  Modified:             linux-mod.eclass
  Log:
  Update linux-mod.eclass for building modules on Linux 3.0* kernels.

Revision  Changes    Path
1.102                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.101&r2=1.102

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -p -w -b -B -u -u -r1.101 -r1.102
--- linux-mod.eclass	27 May 2011 09:46:14 -0000	1.101
+++ linux-mod.eclass	1 Jun 2011 06:51:30 -0000	1.102
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.101 2011/05/27 09:46:14 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.102 2011/06/01 06:51:30 robbat2 Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -195,6 +195,7 @@ use_m() {
 
 	# if the kernel version is greater than 2.6.6 then we should use
 	# M= instead of SUBDIRS=
+	[ ${KV_MAJOR} -eq 3 ] && return 0
 	[ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] && \
 		return 0 || return 1
 }
@@ -328,7 +329,7 @@ remove_moduledb() {
 set_kvobj() {
 	debug-print-function ${FUNCNAME} $*
 
-	if kernel_is 2 6
+	if kernel_is ge 2 6
 	then
 		KV_OBJ="ko"
 	else

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Mike Frysinger (vapier)]

vapier      11/08/09 22:11:53

  Modified:             linux-mod.eclass
  Log:
  drop old comment now that eutils.eclass no longer contains these funcs

Revision  Changes    Path
1.103                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.102&r2=1.103

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- linux-mod.eclass	1 Jun 2011 06:51:30 -0000	1.102
+++ linux-mod.eclass	9 Aug 2011 22:11:53 -0000	1.103
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.102 2011/06/01 06:51:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.103 2011/08/09 22:11:53 vapier Exp $
 
 # Author(s): John Mylchreest <johnm@gentoo.org>,
 #            Stefan Schweizer <genstef@gentoo.org>
@@ -125,11 +125,6 @@
 # @DESCRIPTION:
 # It's a read-only variable. It contains the extension of the kernel modules.
 
-# The order of these is important as both of linux-info and eutils contain
-# set_arch_to_kernel and set_arch_to_portage functions and the ones in eutils
-# are deprecated in favor of the ones in linux-info.
-# See http://bugs.gentoo.org/show_bug.cgi?id=127506
-
 inherit eutils linux-info multilib
 EXPORT_FUNCTIONS pkg_setup pkg_preinst pkg_postinst src_install src_compile pkg_postrm
 

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Samuli Suominen (ssuominen)]

ssuominen    13/03/24 09:54:12

  Modified:             linux-mod.eclass
  Log:
  Remove support for module-init-tools and Linux 2.4. Only works with kmod and 2.6 now.

Revision  Changes    Path
1.109                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.108&r2=1.109

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- linux-mod.eclass	15 Sep 2012 16:16:53 -0000	1.108
+++ linux-mod.eclass	24 Mar 2013 09:54:12 -0000	1.109
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.108 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.109 2013/03/24 09:54:12 ssuominen Exp $
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
@@ -77,12 +77,12 @@
 #   insinto /lib/modules/${KV_FULL}/usb
 #   doins module_usb.${KV_OBJ}
 
-# There is also support for automated modprobe.d/modules.d(2.4) file generation.
+# There is also support for automated modprobe.d file generation.
 # This can be explicitly enabled by setting any of the following variables.
 
 # @ECLASS-VARIABLE: MODULESD_<modulename>_ENABLED
 # @DESCRIPTION:
-# This is used to disable the modprobe.d/modules.d file generation otherwise the file will be
+# This is used to disable the modprobe.d file generation otherwise the file will be
 # always generated (unless no MODULESD_<modulename>_* variable is provided). Set to "no" to disable
 # the generation of the file and the installation of the documentation.
 
@@ -91,7 +91,7 @@
 # This is a bash array containing a list of examples which should
 # be used. If you want us to try and take a guess set this to "guess".
 #
-# For each array_component it's added an options line in the modprobe.d/modules.d file
+# For each array_component it's added an options line in the modprobe.d file
 #
 #   options array_component
 #
@@ -101,7 +101,7 @@
 # @DESCRIPTION:
 # This is a bash array containing a list of associated aliases.
 #
-# For each array_component it's added an alias line in the modprobe.d/modules.d file
+# For each array_component it's added an alias line in the modprobe.d file
 #
 #   alias array_component
 #
@@ -235,27 +235,6 @@
 
 # internal function
 #
-# FUNCTION: update_modules
-# DESCRIPTION:
-# It calls the update-modules utility.
-update_modules() {
-	debug-print-function ${FUNCNAME} $*
-
-	if [ -x /sbin/update-modules ] && \
-		grep -v -e "^#" -e "^$" "${D}"/etc/modules.d/* >/dev/null 2>&1; then
-		ebegin "Updating modules.conf"
-		/sbin/update-modules
-		eend $?
-	elif [ -x /sbin/update-modules ] && \
-		grep -v -e "^#" -e "^$" "${D}"/etc/modules.d/* >/dev/null 2>&1; then
-		ebegin "Updating modules.conf"
-		/sbin/update-modules
-		eend $?
-	fi
-}
-
-# internal function
-#
 # FUNCTION: move_old_moduledb
 # DESCRIPTION:
 # It updates the location of the database used by the module-rebuild utility.
@@ -355,9 +334,9 @@
 #
 # FUNCTION:
 # USAGE: /path/to/the/modulename_without_extension
-# RETURN: A file in /etc/modules.d/ (kernel < 2.6) or /etc/modprobe.d/ (kernel >= 2.6)
+# RETURN: A file in /etc/modprobe.d
 # DESCRIPTION:
-# This function will generate and install the neccessary modprobe.d/modules.d file from the
+# This function will generate and install the neccessary modprobe.d file from the
 # information contained in the modules exported parms.
 # (see the variables MODULESD_<modulename>_ENABLED, MODULESD_<modulename>_EXAMPLES,
 # MODULESD_<modulename>_ALIASES, MODULESD_<modulename>_ADDITION and MODULESD_<modulename>_DOCS).
@@ -402,13 +381,13 @@
 		[[ -z ${!module_*} ]] && return 0
 
 		# OK so now if we have got this far, then we know we want to continue
-		# and generate the modules.d file.
+		# and generate the modprobe.d file.
 		module_modinfo="$(modinfo -p ${currm_path}.${KV_OBJ})"
 		module_config="${T}/modulesd-${currm}"
 
-		ebegin "Preparing file for modules.d"
+		ebegin "Preparing file for modprobe.d"
 		#-----------------------------------------------------------------------
-		echo "# modules.d configuration file for ${currm}" >> "${module_config}"
+		echo "# modprobe.d configuration file for ${currm}" >> "${module_config}"
 		#-----------------------------------------------------------------------
 		[[ -n ${module_docs} ]] && \
 			echo "# For more information please read:" >> "${module_config}"
@@ -494,11 +473,7 @@
 		#-----------------------------------------------------------------------
 
 		# then we install it
-		if kernel_is ge 2 6; then
-			insinto /etc/modprobe.d
-		else
-			insinto /etc/modules.d
-		fi
+		insinto /etc/modprobe.d
 		newins "${module_config}" "${currm_path//*\/}.conf"
 
 		# and install any documentation we might have.
@@ -687,7 +662,7 @@
 # It install the modules specified in MODULES_NAME. The modules should be inside the ${objdir}
 # directory and they are installed inside /lib/modules/${KV_FULL}/${libdir}.
 #
-# The modprobe.d/modules.d configuration file is automatically generated if the
+# The modprobe.d configuration file is automatically generated if the
 # MODULESD_<modulename>_* variables are defined. The only way to stop this process is by
 # setting MODULESD_<modulename>_ENABLED=no. At the end the documentation specified via
 # MODULESD_<modulename>_DOCS is also installed.
@@ -727,27 +702,24 @@
 	debug-print-function ${FUNCNAME} $*
 
 	[ -d "${D}lib/modules" ] && UPDATE_DEPMOD=true || UPDATE_DEPMOD=false
-	[ -d "${D}etc/modules.d" ] && UPDATE_MODULES=true || UPDATE_MODULES=false
 	[ -d "${D}lib/modules" ] && UPDATE_MODULEDB=true || UPDATE_MODULEDB=false
 }
 
 # @FUNCTION: linux-mod_pkg_postinst
 # @DESCRIPTION:
 # It executes /sbin/depmod and adds the package to the /var/lib/module-rebuild/moduledb
-# database (if ${D}/lib/modules is created) and it runs /sbin/update-modules
-# (if ${D}/etc/modules.d is created).
+# database (if ${D}/lib/modules is created)"
 linux-mod_pkg_postinst() {
 	debug-print-function ${FUNCNAME} $*
 
 	${UPDATE_DEPMOD} && update_depmod;
-	${UPDATE_MODULES} && update_modules;
 	${UPDATE_MODULEDB} && update_moduledb;
 }
 
 # @FUNCTION: linux-mod_pkg_postrm
 # @DESCRIPTION:
 # It removes the package from the /var/lib/module-rebuild/moduledb database but it doens't
-# call /sbin/depmod and /sbin/update-modules because the modules are still installed.
+# call /sbin/depmod because the modules are still installed.
 linux-mod_pkg_postrm() {
 	debug-print-function ${FUNCNAME} $*
 	remove_moduledb;

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Samuli Suominen (ssuominen)]

ssuominen    13/03/24 14:16:30

  Modified:             linux-mod.eclass
  Log:
  Don't pull modutils if using the eclass from sys-apps/kmod

Revision  Changes    Path
1.110                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.109&r2=1.110

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- linux-mod.eclass	24 Mar 2013 09:54:12 -0000	1.109
+++ linux-mod.eclass	24 Mar 2013 14:16:30 -0000	1.110
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.109 2013/03/24 09:54:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.110 2013/03/24 14:16:30 ssuominen Exp $
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
@@ -127,7 +127,7 @@
 
 IUSE="kernel_linux"
 SLOT="0"
-RDEPEND="kernel_linux? ( virtual/modutils )"
+[[ ${PN} == kmod ]] || RDEPEND="kernel_linux? ( virtual/modutils )"
 DEPEND="${RDEPEND}
 	sys-apps/sed
 	kernel_linux? ( virtual/linux-sources )"

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Samuli Suominen (ssuominen)]

ssuominen    13/03/26 07:36:11

  Modified:             linux-mod.eclass
  Log:
  Stop pulling in virtual/linux-sources when used for sys-apps/kmod by angry_vincent

Revision  Changes    Path
1.111                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.110&r2=1.111

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- linux-mod.eclass	24 Mar 2013 14:16:30 -0000	1.110
+++ linux-mod.eclass	26 Mar 2013 07:36:11 -0000	1.111
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.110 2013/03/24 14:16:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.111 2013/03/26 07:36:11 ssuominen Exp $
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
@@ -127,10 +127,12 @@
 
 IUSE="kernel_linux"
 SLOT="0"
-[[ ${PN} == kmod ]] || RDEPEND="kernel_linux? ( virtual/modutils )"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	kernel_linux? ( virtual/linux-sources )"
+if ! [[ ${PN} == kmod ]]; then
+	RDEPEND="kernel_linux? ( virtual/modutils )"
+	DEPEND="${RDEPEND}
+		sys-apps/sed
+		kernel_linux? ( virtual/linux-sources )"
+fi
 
 # eclass utilities
 # ----------------------------------

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Samuli Suominen (ssuominen)]

ssuominen    13/03/26 08:17:26

  Modified:             linux-mod.eclass
  Log:
  Control pulling in linux-mod dependencies based on VIRTUAL_MODUTILS variable, set in eg. sys-apps/kmod

Revision  Changes    Path
1.112                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.111&r2=1.112

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- linux-mod.eclass	26 Mar 2013 07:36:11 -0000	1.111
+++ linux-mod.eclass	26 Mar 2013 08:17:26 -0000	1.112
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.111 2013/03/26 07:36:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.112 2013/03/26 08:17:26 ssuominen Exp $
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
@@ -127,7 +127,7 @@
 
 IUSE="kernel_linux"
 SLOT="0"
-if ! [[ ${PN} == kmod ]]; then
+if [[ -z ${VIRTUAL_MODUTILS} ]]; then
 	RDEPEND="kernel_linux? ( virtual/modutils )"
 	DEPEND="${RDEPEND}
 		sys-apps/sed

[gentoo-commits] gentoo-x86 commit in eclass: linux-mod.eclass

[Samuli Suominen (ssuominen)]

ssuominen    13/08/24 11:07:24

  Modified:             linux-mod.eclass
  Log:
  Punt unused if and else wrt bug 462926, Comment #16 and up

Revision  Changes    Path
1.113                eclass/linux-mod.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/linux-mod.eclass?r1=1.112&r2=1.113

Index: linux-mod.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- linux-mod.eclass	26 Mar 2013 08:17:26 -0000	1.112
+++ linux-mod.eclass	24 Aug 2013 11:07:23 -0000	1.113
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.112 2013/03/26 08:17:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/linux-mod.eclass,v 1.113 2013/08/24 11:07:23 ssuominen Exp $
 
 # @ECLASS: linux-mod.eclass
 # @MAINTAINER:
@@ -127,12 +127,10 @@
 
 IUSE="kernel_linux"
 SLOT="0"
-if [[ -z ${VIRTUAL_MODUTILS} ]]; then
-	RDEPEND="kernel_linux? ( virtual/modutils )"
-	DEPEND="${RDEPEND}
-		sys-apps/sed
-		kernel_linux? ( virtual/linux-sources )"
-fi
+RDEPEND="kernel_linux? ( virtual/modutils )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	kernel_linux? ( virtual/linux-sources )"
 
 # eclass utilities
 # ----------------------------------