r1931 - in trunk: . packages/initramfs packages/linux packages/linux/fakes-for-fglrx packages/linux64 packages/linux64/fakes-for-fglrx

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Jun 26 07:57:29 PDT 2007


Author: alexander
Date: 2007-06-26 08:57:29 -0600 (Tue, 26 Jun 2007)
New Revision: 1931

Added:
   trunk/packages/linux/fakes-for-fglrx/
   trunk/packages/linux/fakes-for-fglrx/arch
   trunk/packages/linux/fakes-for-fglrx/makepkg
   trunk/packages/linux/fakes-for-fglrx/uname.in
   trunk/packages/linux64/fakes-for-fglrx/
   trunk/packages/linux64/fakes-for-fglrx/arch
   trunk/packages/linux64/fakes-for-fglrx/gcc
   trunk/packages/linux64/fakes-for-fglrx/ld
   trunk/packages/linux64/fakes-for-fglrx/makepkg
   trunk/packages/linux64/fakes-for-fglrx/objdump
   trunk/packages/linux64/fakes-for-fglrx/uname.in
Modified:
   trunk/Makefile
   trunk/packages/initramfs/init.in
   trunk/packages/linux/Makefile
   trunk/packages/linux64/Makefile
Log:
Added proprietary ATI video driver (untested).


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-06-25 10:59:46 UTC (rev 1930)
+++ trunk/Makefile	2007-06-26 14:57:29 UTC (rev 1931)
@@ -114,14 +114,15 @@
 $(MKTREE): root.ext2
 	mkdir -p $(MP) $(MPBASE)$(SRC) $(MPBASE)$(WD)/bin $(MPBASE)/iso/boot
 	mount -o loop root.ext2 $(MP)
-	-rm -f $(MP)/boot
 	mkdir -p $(MKTREE) $(MP)$(SRC) $(MP)$(WD)
 	mkdir -p $(MP)/boot $(MP)$(LFSSRC) $(MPBASE)/iso$(LFSSRC)
+	mkdir -p $(MP)/drivers $(MPBASE)/iso/drivers
 	mount --bind $(MPBASE)$(ROOT) $(MP)$(ROOT)
 	mount --bind $(MPBASE)$(WD) $(MP)$(WD)
 	mount --bind $(MPBASE)$(SRC) $(MP)$(SRC)
 	mount --bind $(MPBASE)/iso/boot $(MP)/boot
 	mount --bind $(MPBASE)/iso$(LFSSRC) $(MP)$(LFSSRC)
+	mount --bind $(MPBASE)/iso/drivers $(MP)/drivers
 	-ln -nsf $(MPBASE)$(WD) /
 	-ln -nsf $(MPBASE)$(SRC) /
 	-ln -nsf $(MPBASE)$(ROOT) /
@@ -272,9 +273,7 @@
 	ch-fuse ch-dosfstools ch-ntfsprogs \
 	ch-vbetool ch-bin86 ch-grub ch-lilo ch-syslinux \
 	ch-binutils64 ch-gcc64 ch-linux64 ch-scsi-firmware ch-net-firmware \
-	ch-initramfs
-	# Proprietary drivers disabled - NVIDIA crashes, ATI is too fat
-	# make ch-gcc33 ch-proprietary-drivers
+	ch-initramfs ch-gcc33
 	make update-caches
 
 wget-list:
@@ -437,13 +436,13 @@
 	-umount $(MP)/proc
 	-umount $(MP)/sys
 	-umount $(MP)/boot
+	-umount $(MP)/drivers
 	-umount $(MP)$(LFSSRC)
 	-umount $(MP)$(SRC)
 	-umount $(MP)$(WD)
 	-umount $(MP)$(ROOT)
 	-rmdir $(MP)$(SRC) $(MP)$(WD) $(MP)$(ROOT)
-	-rmdir $(MP)/boot $(MP)$(LFSSRC)
-	-ln -s /dev/shm/.cdrom/boot $(MP)
+	-rmdir $(MP)/boot $(MP)$(LFSSRC) $(MP)/drivers
 	-umount $(MP)
 
 zeroes: $(MKTREE)

Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	2007-06-25 10:59:46 UTC (rev 1930)
+++ trunk/packages/initramfs/init.in	2007-06-26 14:57:29 UTC (rev 1931)
@@ -156,6 +156,7 @@
 	ln -sf issue.$cdtype /.root/etc/issue
 	if [ "$cdtype" = "fullcd" ] ; then
 		ln -sf /dev/shm/.cdrom/lfs-sources /.root/lfs-sources
+		ln -sf /dev/shm/.cdrom/drivers /.root/drivers
 	fi
 	if [ "$nodhcp" = "1" ] ; then
 		rm -f /.root/etc/udev/rules.d/76-network.rules

Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile	2007-06-25 10:59:46 UTC (rev 1930)
+++ trunk/packages/linux/Makefile	2007-06-26 14:57:29 UTC (rev 1931)
@@ -10,6 +10,10 @@
 
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 
+FILE1= ati-driver-installer-8.38.6-x86.x86_64.run
+URL-$(FILE1)= http://www2.ati.com/drivers/linux/$(FILE1)
+SHA-$(FILE1)= a4320c6d3c6716740971c18bbd5e62b0b452cc67
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -18,7 +22,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(FILE1)
 	$(std_build)
 
 compile-stage2:
@@ -29,9 +33,14 @@
 	make
 	make modules_install
 	cp -v arch/i386/boot/bzImage /boot/isolinux/linux
+	sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/uname.in >../fakes-for-fglrx/uname
+	chmod 755 ../fakes-for-fglrx/uname
+	PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg Slackware/All
+	mv *.tgz /drivers
 	cd .. ; ./debian-style-headers.sh $(DIR)
 
 clean:
 	-rm -rf $(DIR)
+	-rm fakes-for-fglrx/uname
 
 .PHONY: clean chroot compile-stage2

Added: trunk/packages/linux/fakes-for-fglrx/arch
===================================================================
--- trunk/packages/linux/fakes-for-fglrx/arch	                        (rev 0)
+++ trunk/packages/linux/fakes-for-fglrx/arch	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "i486"


Property changes on: trunk/packages/linux/fakes-for-fglrx/arch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux/fakes-for-fglrx/makepkg
===================================================================
--- trunk/packages/linux/fakes-for-fglrx/makepkg	                        (rev 0)
+++ trunk/packages/linux/fakes-for-fglrx/makepkg	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,4 @@
+#!/bin/sh
+rm -rf install
+mv usr/lib/xorg/modules/dri usr/lib/dri
+tar --exclude $5 -zcvf $5 .


Property changes on: trunk/packages/linux/fakes-for-fglrx/makepkg
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux/fakes-for-fglrx/uname.in
===================================================================
--- trunk/packages/linux/fakes-for-fglrx/uname.in	                        (rev 0)
+++ trunk/packages/linux/fakes-for-fglrx/uname.in	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+case "$1" in
+-a)
+	echo "Linux lfslivecd VERSION #1 SMP x86_64 GNU/Linux"
+	;;
+-s)
+	echo "Linux"
+	;;
+-n)
+	echo "lfslivecd"
+	;;
+-r)
+	echo "VERSION"
+	;;
+-v)
+	echo "#1 SMP"
+	;;
+-m)
+	echo "x86_64"
+	;;
+-p|-i)
+	echo "unknown"
+	;;
+-o)
+	echo "GNU/Linux"
+	;;
+esac
+


Property changes on: trunk/packages/linux/fakes-for-fglrx/uname.in
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile	2007-06-25 10:59:46 UTC (rev 1930)
+++ trunk/packages/linux64/Makefile	2007-06-26 14:57:29 UTC (rev 1931)
@@ -10,6 +10,10 @@
 
 PATCH3= tulip-is-not-a-proper-driver-for-dm910x.patch
 
+FILE1= ati-driver-installer-8.38.6-x86.x86_64.run
+URL-$(FILE1)= http://www2.ati.com/drivers/linux/$(FILE1)
+SHA-$(FILE1)= a4320c6d3c6716740971c18bbd5e62b0b452cc67
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -18,7 +22,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(FILE1)
 	$(std_build)
 
 compile-stage2:
@@ -27,6 +31,10 @@
 	cp ../config.x86_64 .config
 	PATH=$$PATH:$(WD)/bin make ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu-
 	PATH=$$PATH:$(WD)/bin make modules_install ARCH=x86_64 CROSS_COMPILE=x86_64-unknown-linux-gnu-
+	sed 's/VERSION/$(VRS)/' ../fakes-for-fglrx/uname.in >../fakes-for-fglrx/uname
+	chmod 755 ../fakes-for-fglrx/uname
+	PATH=$$PWD/../fakes-for-fglrx:$$PATH sh ../$(FILE1) --buildpkg Slackware/Only_Module
+	mv *.tgz /drivers
 	rm /lib/modules/*-64bit/{source,build}
 	cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux64
 

Added: trunk/packages/linux64/fakes-for-fglrx/arch
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/arch	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/arch	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "x86_64"


Property changes on: trunk/packages/linux64/fakes-for-fglrx/arch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux64/fakes-for-fglrx/gcc
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/gcc	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/gcc	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,9 @@
+#!/bin/sh
+case "$1" in
+--version)
+	echo "gcc (GCC) 4.1.2"
+	;;
+*)
+	/tools/bin/x86_64-unknown-linux-gnu-gcc "$@"
+	;;
+esac


Property changes on: trunk/packages/linux64/fakes-for-fglrx/gcc
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux64/fakes-for-fglrx/ld
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/ld	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/ld	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,2 @@
+#!/bin/sh
+/tools/bin/x86_64-unknown-linux-gnu-ld "$@"


Property changes on: trunk/packages/linux64/fakes-for-fglrx/ld
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux64/fakes-for-fglrx/makepkg
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/makepkg	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/makepkg	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf install
+tar --exclude $5 -zcvf $5 .


Property changes on: trunk/packages/linux64/fakes-for-fglrx/makepkg
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux64/fakes-for-fglrx/objdump
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/objdump	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/objdump	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,2 @@
+#!/bin/sh
+/tools/bin/x86_64-unknown-linux-gnu-objdump "$@"


Property changes on: trunk/packages/linux64/fakes-for-fglrx/objdump
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/linux64/fakes-for-fglrx/uname.in
===================================================================
--- trunk/packages/linux64/fakes-for-fglrx/uname.in	                        (rev 0)
+++ trunk/packages/linux64/fakes-for-fglrx/uname.in	2007-06-26 14:57:29 UTC (rev 1931)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+case "$1" in
+-a)
+	echo "Linux lfslivecd VERSION-64bit #1 SMP x86_64 GNU/Linux"
+	;;
+-s)
+	echo "Linux"
+	;;
+-n)
+	echo "lfslivecd"
+	;;
+-r)
+	echo "VERSION-64bit"
+	;;
+-v)
+	echo "#1 SMP"
+	;;
+-m)
+	echo "x86_64"
+	;;
+-p|-i)
+	echo "unknown"
+	;;
+-o)
+	echo "GNU/Linux"
+	;;
+esac
+


Property changes on: trunk/packages/linux64/fakes-for-fglrx/uname.in
___________________________________________________________________
Name: svn:executable
   + *




More information about the livecd mailing list