Changeset 1934

Timestamp:

06/26/07 10:08:36 (19 months ago)

Author:

alexander

Message:

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.

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• etc/profile (modified) (1 diff)
• packages/initramfs/init.in (modified) (1 diff)
• packages/linux/Makefile (modified) (3 diffs)
• packages/linux/fakes-for-fglrx (deleted)
• packages/linux64/Makefile (modified) (3 diffs)
• packages/linux64/fakes-for-fglrx (deleted)

trunk/Makefile

@@ -115 +115 @@
         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)
@@ -123 +123 @@
         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) /
@@ -274 +273 @@
         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
 
@@ -437 +438 @@
         -umount $(MP)/sys
         -umount $(MP)/boot
-        -umount $(MP)/drivers
         -umount $(MP)$(LFSSRC)
         -umount $(MP)$(SRC)
@@ -443 +443 @@
         -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)
 

trunk/etc/profile

@@ -16 +16 @@
 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

trunk/packages/initramfs/init.in

@@ -157 +157 @@
         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

trunk/packages/linux/Makefile

@@ -11 +11 @@
 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
 
@@ -23 +19 @@
         'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
         $(std_build)
 
@@ -34 +30 @@
         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

trunk/packages/linux64/Makefile

@@ -11 +11 @@
 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
 
@@ -23 +19 @@
         'cd $(ROOT) && make ch-$(NM)64 $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE1)
+stage2: Makefile $(FILE)
         $(std_build)
 
@@ -32 +28 @@
         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