diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2008-06-15 13:29:55 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2008-06-15 13:29:55 +0000 |
| commit | 0817846fa7b35deb5e868a0d12333ed920bc4148 (patch) | |
| tree | 0456d3253c4a23a78f43651ff30a8212c5ed4664 /net-dialup/slmodem | |
| parent | call eautomake when touching Makefile.am, bug #226731. (diff) | |
| download | gentoo-2-0817846fa7b35deb5e868a0d12333ed920bc4148.tar.gz gentoo-2-0817846fa7b35deb5e868a0d12333ed920bc4148.tar.bz2 gentoo-2-0817846fa7b35deb5e868a0d12333ed920bc4148.zip | |
Remove slusb if kernel version is >=2.6.25; exclude unused modules from compilation (#218381).
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-dialup/slmodem')
| -rw-r--r-- | net-dialup/slmodem/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild | 20 |
2 files changed, 21 insertions, 6 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 0a5e4394c2c2..67362e0d52ac 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/slmodem # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.96 2008/05/19 20:26:52 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.97 2008/06/15 13:29:55 mrness Exp $ + + 15 Jun 2008; Alin Năstac <mrness@gentoo.org> + slmodem-2.9.11_pre20080417.ebuild: + Remove slusb if kernel version is >=2.6.25; exclude unused modules from + compilation (#218381). *slmodem-2.9.11_pre20080417 (19 May 2008) diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild index d4e5f9cc2277..4371736a20c2 100644 --- a/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild +++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild,v 1.1 2008/05/19 20:26:52 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080417.ebuild,v 1.2 2008/06/15 13:29:55 mrness Exp $ inherit eutils linux-mod multilib @@ -30,16 +30,24 @@ pkg_setup() { use amd64 && multilib_toolchain_setup x86 MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})" + CONFIG_CHECK="" + MY_SLMODULES="" if ! use amd64; then MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)" + MY_SLMODULES="${MY_SLMODULES} slamr.o" fi - if use usb; then + if kernel_is ge 2 6 25; then + if use usb; then + ewarn "slusb module will not be installed because is not compatible with kernels >=2.6.25" + fi + elif use usb; then MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)" - CONFIG_CHECK="USB" + CONFIG_CHECK="${CONFIG_CHECK} USB" + MY_SLMODULES="${MY_SLMODULES} slusb.o" fi BUILD_TARGETS="all" if kernel_is ge 2 6 24; then - CONFIG_CHECK="PCI_LEGACY" + CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY" fi linux-mod_pkg_setup BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}" @@ -60,7 +68,9 @@ src_unpack() { epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch" cd "${S}"/drivers - sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile + sed -i -e "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \ + -e "s|^obj-m:=.*$|obj-m:=${MY_SLMODULES}|" \ + Makefile convert_to_m Makefile sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \ |