diff options
author | Andrew Bevitt <cyfred@gentoo.org> | 2004-06-23 07:33:25 +0000 |
---|---|---|
committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-06-23 07:33:25 +0000 |
commit | 6a0601b15b00bdb60316c38f721dbe176d76902c (patch) | |
tree | 1163ee035cd1ff16e831fbf5161b9de12df51acf /x11-base/kdrive | |
parent | Adding metadata.xml (Manifest recommit) (diff) | |
download | gentoo-2-6a0601b15b00bdb60316c38f721dbe176d76902c.tar.gz gentoo-2-6a0601b15b00bdb60316c38f721dbe176d76902c.tar.bz2 gentoo-2-6a0601b15b00bdb60316c38f721dbe176d76902c.zip |
Reverting to old kernel detection method for livecd. Integrating koutput.
Diffstat (limited to 'x11-base/kdrive')
-rw-r--r-- | x11-base/kdrive/ChangeLog | 5 | ||||
-rw-r--r-- | x11-base/kdrive/kdrive-4.3.0-r5.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog index 64bffd5a3ea7..1a7a214aa480 100644 --- a/x11-base/kdrive/ChangeLog +++ b/x11-base/kdrive/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-base/kdrive # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.19 2004/06/12 07:47:37 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.20 2004/06/23 07:33:25 cyfred Exp $ + + 23 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild: + Reverting old kernel detection method for livecd, integrating koutput 12 Jun 2004; Andrew Bevitt <cyfred@gentoo.org>; kdrive-4.3.0-r5.ebuild: Adding support for koutput in kernel tree diff --git a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild index 163e35ec7eec..f50adf22269b 100644 --- a/x11-base/kdrive/kdrive-4.3.0-r5.ebuild +++ b/x11-base/kdrive/kdrive-4.3.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.5 2004/06/12 07:47:37 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r5.ebuild,v 1.6 2004/06/23 07:33:25 cyfred Exp $ # If you don't want to build the Xvesa server, do this. # VESA="no" emerge kdrive @@ -134,7 +134,10 @@ src_unpack() { fi get_kernel_info - if [ "${KV_MAJOR}" -ge "2" -a "${KV_MINOR}" -ge "4" ] + if [ "${KV_MAJOR}" -ge "2" -a "${KV_MINOR}" -ge "4" ] || \ + ( [ -e "/usr/src/linux" ] && \ + [ ! `is_kernel "2" "2"` ] ) || \ + [ "`uname -r | cut -d. -f1,2`" != "2.2" ] then echo "#define HasLinuxInput YES" >> config/cf/host.def fi |