diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2004-08-17 14:02:24 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2004-08-17 14:02:24 +0000 |
| commit | 464bd53e55b283329dfa2b1cd7425ced55fdc5a6 (patch) | |
| tree | 46248ed43baba8b98228bac727bf66f6b17b94c2 /media-video | |
| parent | added macos keyword (Manifest recommit) (diff) | |
| download | gentoo-2-464bd53e55b283329dfa2b1cd7425ced55fdc5a6.tar.gz gentoo-2-464bd53e55b283329dfa2b1cd7425ced55fdc5a6.tar.bz2 gentoo-2-464bd53e55b283329dfa2b1cd7425ced55fdc5a6.zip | |
fix
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/em8300-modules/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild | 18 |
2 files changed, 17 insertions, 8 deletions
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog index 56da47313675..910ec1207e91 100644 --- a/media-video/em8300-modules/ChangeLog +++ b/media-video/em8300-modules/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for media-video/em8300-modules # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.8 2004/08/11 10:50:10 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.9 2004/08/17 14:02:24 arj Exp $ + 17 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 : + Don't install 2.4 modules on a 2.6 kernel. Will confuse modprobe. Thanx + to Rasmus B. Nielsen <r10@cs.auc.dk> for pointing it out. Also get the + correct kernel version. + *em8300-modules-0.15.0_pre20040525 (11 Aug 2004) 11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 : diff --git a/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild index 2fb43b7ca233..e7d5d28f7786 100644 --- a/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild +++ b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild @@ -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/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild,v 1.1 2004/08/11 10:50:10 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild,v 1.2 2004/08/17 14:02:24 arj Exp $ DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules" HOMEPAGE="http://dxr3.sourceforge.net" @@ -20,7 +20,6 @@ src_unpack () { unpack ${A} cd ${S} - } src_compile () { @@ -36,12 +35,17 @@ src_install () { insinto "/usr/include/linux" doins ../include/linux/em8300.h + KERNEL=`uname -r` + # The driver goes into the standard modules location - insinto "/lib/modules/${KV}/kernel/drivers/video" - # 2.6 - doins em8300.ko bt865.ko adv717x.ko - # 2.4 - doins em8300.o bt865.o adv717x.o + insinto "/lib/modules/${KERNEL}/kernel/drivers/video" + + if [ "${KERNEL:0:3}" == "2.6" ] + then + doins em8300.ko bt865.ko adv717x.ko + else + doins em8300.o bt865.o adv717x.o + fi # Docs dodoc README-modoptions \ |