Changeset 2047

Timestamp:

08/29/07 22:38:10 (17 months ago)

Author:

alexander

Message:

Incorporated changes from 6.3 stealth update
Partially fixed nvidia problem (todo: fix libGL.la)

Location:

trunk/packages

Files:

• LFS-BOOK/Makefile (modified) (1 diff)
• lfs-bootscripts/Makefile (modified) (1 diff)
• linux/build-nvidia-driver (modified) (1 diff)
• linux64/build-nvidia-driver.native (modified) (1 diff)
• udev/Makefile (modified) (1 diff)

trunk/packages/LFS-BOOK/Makefile

@@ -11 +11 @@
 #SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052
 
-REV= 8340
+REV= 8348
 REVPARM= -r $(REV)
 

trunk/packages/lfs-bootscripts/Makefile

@@ -7 +7 @@
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.3/$(FILE)
-SHA-$(FILE)= 0177e3b1d43c087b677ba10ddfd4cb2cc7dcd7eb
+SHA-$(FILE)= f2447b29f99e9b4d6700d89a4d572584951531b8
 
 PATCH1= $(NM)-livecd-1.patch

trunk/packages/linux/build-nvidia-driver

@@ -14 +14 @@
 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 glx/usr/lib/xorg/modules
+if [ -f libnvidia-wfb.so.* ] ; then
+        ln -s libnvidia-wfb.so.* libwfb.so
+fi
+cd ../../../../..
+ldconfig -n glx/usr/lib
 cd kernel ; tar zcvf ../../${1%-pkg0}-kernel-$2.tgz . ; cd ..
 cd glx ; tar zcvf ../../${1%-pkg0}-glx.tgz . ; cd ..

trunk/packages/linux64/build-nvidia-driver.native

@@ -14 +14 @@
 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 glx/usr/lib/xorg/modules
+if [ -f libnvidia-wfb.so.* ] ; then
+        ln -s libnvidia-wfb.so.* libwfb.so
+fi
+cd ../../../../..
+ldconfig -n glx/usr/lib
 cd kernel ; tar zcvf ../../${1%-pkg0}-kernel-$2.tgz . ; cd ..
 cd glx ; tar zcvf ../../${1%-pkg0}-glx.tgz . ; cd ..

trunk/packages/udev/Makefile

@@ -13 +13 @@
 FILE1= $(CONFDIR).tar.bz2
 URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/6.3/$(FILE1)
-SHA-$(FILE1)= 02fac7eec2763cce6c0698040221ce1f771c40a5
+SHA-$(FILE1)= c21ade3df7c121694dd56668b0fdc2f3995e2779
 
 # Targets