From dc557e9ebfaa119d286b14e1e7079b07333501d0 Mon Sep 17 00:00:00 2001 From: Andrew Bevitt Date: Fri, 2 Jul 2004 05:26:46 +0000 Subject: Adding nvidia-kernel-1.0.6106 --- media-video/nvidia-kernel/ChangeLog | 12 +- media-video/nvidia-kernel/Manifest | 5 +- .../NVIDIA_kernel-1.0-6106-koutput-support.patch | 210 +++++++++++++++++++++ .../files/digest-nvidia-kernel-1.0.6106 | 1 + media-video/nvidia-kernel/metadata.xml | 4 + .../nvidia-kernel/nvidia-kernel-1.0.6106.ebuild | 122 ++++++++++++ 6 files changed, 352 insertions(+), 2 deletions(-) create mode 100644 media-video/nvidia-kernel/files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch create mode 100644 media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 create mode 100644 media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index f35f56260a50..de5c7db76788 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.78 2004/06/30 07:58:17 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.79 2004/07/02 05:26:46 cyfred Exp $ + +*nvidia-kernel-1.0.6106 (02 Jul 2004) + + 02 Jul 2004; Andrew Bevitt ; metadata.xml, + +files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch, + +nvidia-kernel-1.0.6106.ebuild: + Commiting 6106 to CVS. Thanks to Kris Kersey (augustus) for getting this + version off the ground, and thanks to all the testers from bug #55714. This + version has 4K stacks support, includes SYSFS support and has the kernel + module and glx combined into one package. 30 Jun 2004; Andrew Bevitt ; +files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuild-koutput-support.patch, diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest index 798199e3506b..a7223584065f 100644 --- a/media-video/nvidia-kernel/Manifest +++ b/media-video/nvidia-kernel/Manifest @@ -6,7 +6,8 @@ MD5 498cce7943971f5f2dcafe34d97ffc9c nvidia-kernel-1.0.4496-r3.ebuild 4276 MD5 ecdc3ce7ea1a04cf4740da7af4244223 nvidia-kernel-1.0.4363-r3.ebuild 4061 MD5 9d1c149259777e6a289b58ce4752c584 nvidia-kernel-1.0.5336-r2.ebuild 4656 MD5 b75549a956041d9c76353b9ac64978dc ChangeLog 18761 -MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158 +MD5 2e350a0784b0810b89809d761e499bea metadata.xml 301 +MD5 6e412c5003f735d26c9a6fdd3168f5ed nvidia-kernel-1.0.6106.ebuild 3390 MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328-r1 80 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-kernel-1.0.5332-r1 83 @@ -14,6 +15,7 @@ MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r2 80 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r3 80 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r4 80 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74 +MD5 58184a40423b6f855eb526e9f860eea2 files/digest-nvidia-kernel-1.0.6106 83 MD5 089e6829e7e8497a603ba9dc9563a722 files/nvidia 30 MD5 56ebaa3ba92e9db848baea746a6aef1a files/digest-nvidia-kernel-1.0.4363-r3 74 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-kernel-1.0.4496-r3 80 @@ -35,3 +37,4 @@ MD5 d48d291f79542df558588d1d3575d51c files/1.0.5336/NVIDIA_kernel-1.0-5336-kbuil MD5 442f1483c003d291a90dfcc87903b045 files/1.0.5336/NVIDIA_kernel-1.0-5336-2.6-20040521.patch 18711 MD5 5dc4b9a2463cb459721ae3e642f6239f files/1.0.5336/NVIDIA_kernel-1.0-5336-fix-makefile-for-2.6.patch 886 MD5 7bf40e44b8f2181a1047ddfd13acd6b3 files/1.0.5336/NVIDIA_kernel-1.0-5336-basic-sysfs-support.patch 5439 +MD5 2cf3b7ec2c51b4ee10af01e94fe92df8 files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch 6626 diff --git a/media-video/nvidia-kernel/files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch b/media-video/nvidia-kernel/files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch new file mode 100644 index 000000000000..d9ce8cee1ef5 --- /dev/null +++ b/media-video/nvidia-kernel/files/1.0.6106/NVIDIA_kernel-1.0-6106-koutput-support.patch @@ -0,0 +1,210 @@ +--- Makefile.kbuild.old 2004-07-01 13:54:56.542258768 +1000 ++++ Makefile.kbuild 2004-07-01 13:57:04.861751240 +1000 +@@ -93,14 +93,23 @@ + ifdef SYSSRC + KERNEL_SOURCES := $(SYSSRC) + KERNEL_HEADERS := $(KERNEL_SOURCES)/include ++ ifdef KVOUT ++ ifneq ($(SYSSRC),$(KVOUT)) ++ KOUTPUT_HEADERS := $(KVOUT)/include ++ endif ++ endif ++ ifndef KOUTPUT_HEADERS ++ KOUTPUT_HEADERS := $(KERNEL_HEADERS) ++ endif + else +- KERNEL_UNAME := $(shell uname -r) +- KERNEL_SOURCES := /lib/modules/$(KERNEL_UNAME)/build +- KERNEL_HEADERS := $(KERNEL_SOURCES)/include ++ KERNEL_UNAME := $(shell uname -r) ++ KERNEL_SOURCES := /lib/modules/$(KERNEL_UNAME)/build ++ KERNEL_HEADERS := $(KERNEL_SOURCES)/include ++ KOUTPUT_HEADERS := $(KERNEL_HEADERS) + endif + + CC ?= gcc +-CONFTEST := sh $(src)/conftest.sh "$(CC)" $(KERNEL_HEADERS) ++CONFTEST := sh $(src)/conftest.sh "$(CC)" $(KERNEL_HEADERS) $(KOUTPUT_HEADERS) + + KERNEL_UNAME ?= $(shell $(CONFTEST) get_uname) + MODULE_ROOT := /lib/modules/$(KERNEL_UNAME)/kernel/drivers +--- Makefile.nvidia.old 2004-07-01 13:55:03.054268792 +1000 ++++ Makefile.nvidia 2004-07-01 13:55:17.799027248 +1000 +@@ -21,6 +21,14 @@ + ifdef SYSSRC + KERNEL_SOURCES := $(SYSSRC) + KERNEL_HEADERS := $(KERNEL_SOURCES)/include ++ ifdef KVOUT ++ ifneq ($(SYSSRC),$(KVOUT)) ++ KOUTPUT_HEADERS := $(KVOUT)/include ++ endif ++ endif ++ ifndef KOUTPUT_HEADERS ++ KOUTPUT_HEADERS := $(KERNEL_SOURCES) ++ endif + else + ifdef SYSINCLUDE + KERNEL_HEADERS := $(SYSINCLUDE) +@@ -28,10 +35,11 @@ + KERNEL_UNAME := $(shell uname -r) + KERNEL_HEADERS := /lib/modules/$(KERNEL_UNAME)/build/include + endif ++ KOUTPUT_HEADERS := $(KERNEL_SOURCES) + endif + + CC ?= cc +-CONFTEST := sh ./conftest.sh "$(CC)" $(KERNEL_HEADERS) ++CONFTEST := sh ./conftest.sh "$(CC)" $(KERNEL_HEADERS) $(KOUTPUT_HEADERS) + + KERNEL_UNAME ?= $(shell $(CONFTEST) get_uname) + MODULE_ROOT := /lib/modules/$(KERNEL_UNAME)/kernel/drivers +--- makefile.old 2004-07-01 13:54:48.070546664 +1000 ++++ makefile 2004-07-01 13:55:13.966609864 +1000 +@@ -11,12 +11,21 @@ + else + KERNEL_HEADERS := /lib/modules/$(shell uname -r)/build/include + endif ++ KOUTPUT_HEADERS := $(KERNEL_HEADERS) + else + KERNEL_HEADERS := $(SYSSRC)/include ++ ifdef KVOUT ++ ifneq ($(SYSSRC),$(KVOUT)) ++ KOUTPUT_HEADERS := $(KVOUT)/include ++ endif ++ endif ++ ifndef KOUTPUT_HEADERS ++ KOUTPUT_HEADERS := $(KERNEL_HEADERS) ++ endif + endif + + CC ?= cc +-CONFTEST := sh ./conftest.sh "$(CC)" $(KERNEL_HEADERS) ++CONFTEST := sh ./conftest.sh "$(CC)" $(KERNEL_HEADERS) $(KOUTPUT_HEADERS) + + .PHONY: select_makefile + select_makefile: +--- conftest.sh.old 2004-07-01 13:54:41.750507456 +1000 ++++ conftest.sh 2004-07-01 13:55:08.910378528 +1000 +@@ -7,16 +7,18 @@ + + CC="$1" + ISYSTEM=`$CC -print-file-name=include` +-HEADERS=$2 ++SOURCE_HEADERS=$2 ++BUILT_HEADERS=$3 + + CFLAGS="-D__KERNEL__ \ + -Werror \ + -nostdinc \ + -isystem $ISYSTEM \ +--I $HEADERS -I $HEADERS/asm/mach-default \ ++-I $SOURCE_HEADERS -I $SOURCE_HEADERS/asm/mach-default \ ++-I $BUILT_HEADERS -I $BUILT_HEADERS/../include2/asm/mach-default \ + -Wimplicit-function-declaration" + +-case "$3" in ++case "$4" in + remap_page_range) + # + # Determine the number of arguments expected by remap_page_range. +@@ -124,7 +126,7 @@ + # Determine the kernel's major patch level; this is only done if we + # aren't told by KBUILD. + # +- SOURCES=$HEADERS/.. ++ SOURCES=$SOURCE_HEADERS/.. + + echo $(grep "^PATCHLEVEL =" $SOURCES/Makefile | cut -d " " -f 3) + exit 0 +@@ -193,7 +195,7 @@ + RET=1 + OUTPUT=$4 + +- if [ -f $HEADERS/linux/version.h ]; then ++ if [ -f $BUILT_HEADERS/linux/version.h ]; then + # + # We are either looking at a configured kernel source + # tree or at headers shipped for a specific kernel. +@@ -208,7 +210,7 @@ + } + }" > conftest$$.c + +- $CC conftest$$.c -o conftest$$ -nostdinc -I $HEADERS > /dev/null 2>&1 ++ $CC conftest$$.c -o conftest$$ -nostdinc -I $BUILT_HEADERS > /dev/null 2>&1 + rm -f conftest$$.c + + if [ -f conftest$$ ]; then +@@ -222,8 +224,8 @@ + RET=0 + fi + else +- MAKEFILE=$HEADERS/../Makefile +- CONFIG=$HEADERS/../.config ++ MAKEFILE=$SOURCE_HEADERS/../Makefile ++ CONFIG=$BUILT_HEADERS/../.config + + if [ -f $MAKEFILE -a -f $CONFIG ]; then + # +@@ -275,7 +277,7 @@ + return 0; + }" > conftest$$.c + +- $CC conftest$$.c -o conftest$$ -nostdinc -I $HEADERS > /dev/null 2>&1 ++ $CC conftest$$.c -o conftest$$ -nostdinc -I $BUILT_HEADERS > /dev/null 2>&1 + rm -f conftest$$.c + + if [ -f conftest$$ ]; then +@@ -296,7 +298,7 @@ + RET=1 + OUTPUT=$4 + +- if [ -f $HEADERS/linux/autoconf.h ]; then ++ if [ -f $BUILT_HEADERS/linux/autoconf.h ]; then + # + # We are looking at a configured source tree; verify + # that its configuration doesn't include rivafb using +@@ -308,7 +310,7 @@ + #endif + " > conftest$$.c + +- $CC -c conftest$$.c -nostdinc -I $HEADERS > /dev/null 2>&1 ++ $CC -c conftest$$.c -nostdinc -I $BUILT_HEADERS > /dev/null 2>&1 + rm -f conftest$$.c + + if [ -f conftest$$.o ]; then +@@ -316,7 +318,7 @@ + RET=0 + fi + else +- CONFIG=$HEADERS/../.config ++ CONFIG=$BUILT_HEADERS/../.config + if [ -f $CONFIG ]; then + if [ -z "$(grep "^CONFIG_FB_RIVA=y" $CONFIG)" ]; then + RET=0 +@@ -352,7 +354,7 @@ + RET=1 + OUTPUT=$4 + +- if [ -f $HEADERS/linux/autoconf.h ]; then ++ if [ -f $BUILT_HEADERS/linux/autoconf.h ]; then + # + # We are looking at a configured source tree; verify + # that its configuration doesn't include rivafb using +@@ -364,7 +366,7 @@ + #endif + " > conftest$$.c + +- $CC -c conftest$$.c -nostdinc -I $HEADERS > /dev/null 2>&1 ++ $CC -c conftest$$.c -nostdinc -I $BUILT_HEADERS > /dev/null 2>&1 + rm -f conftest$$.c + + if [ -f conftest$$.o ]; then +@@ -372,7 +374,7 @@ + RET=0 + fi + else +- CONFIG=$HEADERS/../.config ++ CONFIG=$BUILT_HEADERS/../.config + if [ -f $CONFIG ]; then + if [ -z "$(grep "^CONFIG_FB_RIVA=m" $CONFIG)" ]; then + RET=0 diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 new file mode 100644 index 000000000000..3e0157fffab3 --- /dev/null +++ b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 @@ -0,0 +1 @@ +MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301 diff --git a/media-video/nvidia-kernel/metadata.xml b/media-video/nvidia-kernel/metadata.xml index d458318e80ba..3a44ce29c69f 100644 --- a/media-video/nvidia-kernel/metadata.xml +++ b/media-video/nvidia-kernel/metadata.xml @@ -2,4 +2,8 @@ xfree + + xfree@gentoo.org + +Linux kernel module for then NVIDIA X11 driver diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild new file mode 100644 index 000000000000..7f8741514376 --- /dev/null +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild,v 1.1 2004/07/02 05:26:46 cyfred Exp $ + +inherit eutils kmod + +if use x86; then + PKG_V="pkg1" +elif use amd64 ; then + PKG_V="pkg2" +fi +NV_V="${PV/1.0./1.0-}" +if use x86; then + NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" +elif use amd64 ; then + NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" +fi +S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv" +DESCRIPTION="Linux kernel module for then NVIDIA X11 driver" +HOMEPAGE="http://www.nvidia.com/" +SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run) + amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run)" + +# The slot needs to be set to $KV to prevent unmerges of modules for other kernels. +LICENSE="NVIDIA" +SLOT="${KV}" +KEYWORDS="-* ~x86 ~amd64" +RESTRICT="nostrip" +IUSE="" + +DEPEND="virtual/linux-sources" +export _POSIX2_VERSION="199209" + +KMOD_SOURCES="none" + +mtrr_check() { + if [ ! -f /proc/mtrr ] + then + eerror "This version needs MTRR support for most chipsets!" + eerror "Please enable MTRR support in your kernel config, found at:" + eerror + eerror " Processor type and features -> [*] MTRR (Memory Type Range Register) support" + eerror + eerror "and recompile your kernel ..." + die "MTRR support not detected!" + fi +} + +pkg_setup() { + mtrr_check +} + +src_unpack() { + # Let the kmod eclass set the variables for us + kmod_src_unpack + + cd ${WORKDIR} + bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only + + # Add patches below, with a breif description. + # 1) SYSFS supported by nvidia + # 2) minion.de patches not released yet + + cd ${S} + + # Add koutput compile time support... this is hackish + epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-koutput-support.patch + + # if you set this then it's your own fault when stuff breaks :) + [ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile.* +} + +src_compile() { + # IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been + # updated but the running kernel is still compiled with an older gcc. This is + # needed for chrooted building, where the sanity check detects the gcc of the + # kernel outside the chroot rather than within. + if is_kernel 2 5 || is_kernel 2 6 + then + unset ARCH + fi + make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" KVOUT="${KV_OUTPUT}" \ + clean module V=1 || die "Failed to build module" +} + +src_install() { + # The driver goes into the standard modules location + insinto /lib/modules/${KV}/video + + # Insert the module + doins nvidia.${KV_OBJ} + + # Add the aliases + insinto /etc/modules.d + newins ${FILESDIR}/nvidia-1.1 nvidia + + # Docs + dodoc ${S}/README + + # The device creation script + into / + newsbin ${S}/makedevices.sh NVmakedevices.sh +} + +pkg_postinst() { + if [ "${ROOT}" = "/" ] + then + # Update module dependency + [ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules + if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ] + then + /sbin/NVmakedevices.sh >/dev/null 2>&1 + fi + fi + + echo + einfo "If you need to load the module automatically on boot up you need" + einfo "to add \"nvidia\" to /etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}" + echo + einfo "Please note that the driver name is \"nvidia\", not \"NVdriver\"" + echo +} -- cgit v1.2.3-65-gdbad