r1934 - in trunk: . etc packages/initramfs packages/linux packages/linux64

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Jun 26 09:08:36 PDT 2007


Author: alexander
Date: 2007-06-26 10:08:36 -0600 (Tue, 26 Jun 2007)
New Revision: 1934

Removed:
   trunk/packages/linux/fakes-for-fglrx/
   trunk/packages/linux64/fakes-for-fglrx/
Modified:
   trunk/Makefile
   trunk/etc/profile
   trunk/packages/initramfs/init.in
   trunk/packages/linux/Makefile
   trunk/packages/linux64/Makefile
Log:
Revert fglrx addition - on ums.usu.ru, it somehow finds that the host kernel has been built with gcc-3.3 and fails to build.

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-06-26 15:30:17 UTC (rev 1933)
+++ trunk/Makefile	2007-06-26 16:08:36 UTC (rev 1934)
@@ -114,15 +114,14 @@
 $(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) /
@@ -273,7 +272,9 @@
 	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 ch-gcc33
+	ch-initramfs
+	# Proprietary drivers disabled - NVIDIA crashes, ATI is too fat
+	# make ch-gcc33 ch-proprietary-drivers
 	make update-caches
 
 wget-list:
@@ -436,13 +437,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) $(MP)/drivers
+	-rmdir $(MP)/boot $(MP)$(LFSSRC)
+	-ln -s /dev/shm/.cdrom/boot $(MP)
 	-umount $(MP)
 
 zeroes: $(MKTREE)

Modified: trunk/etc/profile
===================================================================
--- trunk/etc/profile	2007-06-26 15:30:17 UTC (rev 1933)
+++ trunk/etc/profile	2007-06-26 16:08:36 UTC (rev 1934)
@@ -15,10 +15,7 @@
 XMODIFIERS=@im=SCIM
 GTK_IM_MODULE=scim
 
-# For fglrx
-LIBGL_DRIVERS_DIR=/usr/lib/dri
-
 export PATH INPUTRC G_FILENAME_ENCODING PKG_CONFIG_PATH XML_CATALOG_FILES
-export WWW_HOME NNTPSERVER TERMCMD XMODIFIERS GTK_IM_MODULE LIBGL_DRIVERS_DIR
+export WWW_HOME NNTPSERVER TERMCMD XMODIFIERS GTK_IM_MODULE
 
 source /etc/bashrc

Modified: trunk/packages/initramfs/init.in
===================================================================
--- trunk/packages/initramfs/init.in	2007-06-26 15:30:17 UTC (rev 1933)
+++ trunk/packages/initramfs/init.in	2007-06-26 16:08:36 UTC (rev 1934)
@@ -156,7 +156,6 @@
 	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-26 15:30:17 UTC (rev 1933)
+++ trunk/packages/linux/Makefile	2007-06-26 16:08:36 UTC (rev 1934)
@@ -10,10 +10,6 @@
 
 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
@@ -22,7 +18,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
@@ -33,14 +29,9 @@
 	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

Modified: trunk/packages/linux64/Makefile
===================================================================
--- trunk/packages/linux64/Makefile	2007-06-26 15:30:17 UTC (rev 1933)
+++ trunk/packages/linux64/Makefile	2007-06-26 16:08:36 UTC (rev 1934)
@@ -10,10 +10,6 @@
 
 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
@@ -22,7 +18,7 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
@@ -31,10 +27,6 @@
 	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
 




More information about the livecd mailing list