r1937 - in trunk/packages: linux linux64

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Jun 28 03:55:46 PDT 2007


Author: alexander
Date: 2007-06-28 04:55:46 -0600 (Thu, 28 Jun 2007)
New Revision: 1937

Added:
   trunk/packages/linux/build-nvidia-driver
   trunk/packages/linux64/build-nvidia-driver
Modified:
   trunk/packages/linux/Makefile
   trunk/packages/linux64/Makefile
Log:
Added nvidia driver


Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2007-06-28 10:55:10 UTC (rev 1936)
+++ trunk/packages/linux/Makefile	2007-06-28 10:55:46 UTC (rev 1937)
@@ -14,6 +14,21 @@
 URL-$(FILE1)= http://www2.ati.com/drivers/linux/$(FILE1)
 SHA-$(FILE1)= a4320c6d3c6716740971c18bbd5e62b0b452cc67
 
+DIR2= NVIDIA-Linux-x86-100.14.11-pkg0
+FILE2= $(DIR2).run
+URL-$(FILE2)= http://us.download.nvidia.com/XFree86/Linux-x86/100.14.11/$(FILE2)
+SHA-$(FILE2)= 95e101a5b1567bbcce91ce18f48e19d2c344ff05
+
+DIR3= NVIDIA-Linux-x86-1.0-9639-pkg0
+FILE3= $(DIR3).run
+URL-$(FILE3)= http://us.download.nvidia.com/XFree86/Linux-x86/1.0-9639/$(FILE3)
+SHA-$(FILE3)= 07b879712fb8b39ad3a11f4d5e0f16c95539e2d3
+
+DIR4= NVIDIA-Linux-x86-1.0-7185-pkg0
+FILE4= $(DIR4).run
+URL-$(FILE4)= http://us.download.nvidia.com/XFree86/Linux-x86/1.0-7185/$(FILE4)
+SHA-$(FILE4)= 35593bee1499aaa429d9572a0c49f2fd137d0d22
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -22,7 +37,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4)
 	$(std_build)
 
 compile-stage2:
@@ -37,6 +52,8 @@
 	sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/cat.in >../fakes-for-fglrx/cat
 	chmod 755 ../fakes-for-fglrx/{uname,cat}
 	PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg Slackware/All
+	for a in $(DIR2) $(DIR3) $(DIR4) ; do \
+	    sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS) ; done
 	mv *.tgz /drivers
 	cd .. ; ./debian-style-headers.sh $(DIR)
 

Added: trunk/packages/linux/build-nvidia-driver
===================================================================
--- trunk/packages/linux/build-nvidia-driver	                        (rev 0)
+++ trunk/packages/linux/build-nvidia-driver	2007-06-28 10:55:46 UTC (rev 1937)
@@ -0,0 +1,18 @@
+#!/bin/sh
+cd $1/usr/src/nv
+sed -i 's/: select_makefile$/:/' makefile
+sed -i 's/^module:.*$/module:/' Makefile.kbuild
+ln -s Makefile.kbuild Makefile
+make KERNEL_MODLIB=/lib/modules/$2 module
+cd ../../..
+mkdir -p kernel/lib/modules/$2/external
+cp usr/src/nv/nvidia.ko kernel/lib/modules/$2/external
+mkdir -p glx/usr/{bin,lib/xorg/modules}
+cp usr/bin/{nvidia-settings,nvidia-xconfig} glx/usr/bin
+cp usr/lib/{libGL*,libnvidia-cfg*,tls/libnvidia-tls*} glx/usr/lib
+cp usr/X11R6/lib/lib* glx/usr/lib
+cp -r usr/{include,share} glx/usr
+cp -r usr/X11R6/lib/modules/* glx/usr/lib/xorg/modules
+ldconfig -n glx/usr/lib glx/usr/lib/xorg/modules glx/usr/lib/xorg/modules/extensions
+cd kernel ; tar zcvf ../../${1%-pkg0}-kernel-$2.tgz . ; cd ..
+cd glx ; tar zcvf ../../${1%-pkg0}-glx.tgz . ; cd ..


Property changes on: trunk/packages/linux/build-nvidia-driver
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile	2007-06-28 10:55:10 UTC (rev 1936)
+++ trunk/packages/linux64/Makefile	2007-06-28 10:55:46 UTC (rev 1937)
@@ -14,6 +14,21 @@
 URL-$(FILE1)= http://www2.ati.com/drivers/linux/$(FILE1)
 SHA-$(FILE1)= a4320c6d3c6716740971c18bbd5e62b0b452cc67
 
+DIR2= NVIDIA-Linux-x86_64-100.14.11-pkg0
+FILE2= $(DIR2).run
+URL-$(FILE2)= http://us.download.nvidia.com/XFree86/Linux-x86_64/100.14.11/$(FILE2)
+SHA-$(FILE2)= 11c4f7ab736262e20db937ec410de3511e3e6aad
+
+DIR3= NVIDIA-Linux-x86_64-1.0-9639-pkg0
+FILE3= $(DIR3).run
+URL-$(FILE3)= http://us.download.nvidia.com/XFree86/Linux-x86_64/1.0-9639/$(FILE3)
+SHA-$(FILE3)= 6294d421131b9dc4514634ecde171869f589dae3
+
+DIR4= NVIDIA-Linux-x86_64-1.0-7185-pkg0
+FILE4= $(DIR4).run
+URL-$(FILE4)= http://us.download.nvidia.com/XFree86/Linux-x86_64/1.0-7185/$(FILE4)
+SHA-$(FILE4)= ffe1eb012707d5bffbe39756be54cb687b4ef498
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -22,7 +37,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE) $(FILE1) $(FILE2) $(FILE3) $(FILE4)
 	$(std_build)
 
 compile-stage2:
@@ -35,6 +50,8 @@
 	sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/cat.in >../fakes-for-fglrx/cat
 	chmod 755 ../fakes-for-fglrx/{uname,cat}
 	PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg Slackware/Only_Module
+	for a in $(DIR2) $(DIR3) $(DIR4) ; do \
+	    sh ../$$a.run -x ; ../build-nvidia-driver $$a $(VRS)-64bit ; done
 	mv *.tgz /drivers
 	rm /lib/modules/*-64bit/{source,build}
 	cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64

Added: trunk/packages/linux64/build-nvidia-driver
===================================================================
--- trunk/packages/linux64/build-nvidia-driver	                        (rev 0)
+++ trunk/packages/linux64/build-nvidia-driver	2007-06-28 10:55:46 UTC (rev 1937)
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd $1/usr/src/nv
+sed -i 's/: select_makefile$/:/' makefile
+sed -i 's/^module:.*$/module:/' Makefile.kbuild
+ln -s Makefile.kbuild Makefile
+PATH=$PATH:/tools/bin make KERNEL_MODLIB=/lib/modules/$2 ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu- module
+cd ../../..
+mkdir -p kernel/lib/modules/$2/external
+cp usr/src/nv/nvidia.ko kernel/lib/modules/$2/external
+cd kernel ; tar zcvf ../../${1%-pkg0}-kernel-$2.tgz . ; cd ..


Property changes on: trunk/packages/linux64/build-nvidia-driver
___________________________________________________________________
Name: svn:executable
   + *




More information about the livecd mailing list