Permalink
Browse files

Completely removing any catalyst functionality - free drivers will ha…

…ve to do
  • Loading branch information...
1 parent d07fe2b commit 3baa92faf55a44770fbe4b47b57e7dda3b1e74b6 @svenstaro committed Apr 29, 2011
Showing with 41 additions and 69 deletions.
  1. +0 −8 buildscript.sh
  2. +1 −1 overlay/etc/rc.conf
  3. +40 −54 overlay/etc/rc.local
  4. +0 −6 pacman.conf
View
@@ -100,14 +100,6 @@ overlay ()
mv -f `ls nvidia-*pkg.tar.*|grep -v utils|grep -v 173xx` nvidia-recent.tar.xz || return 1
mv -f `ls nvidia-*pkg.tar.*|grep utils|grep -v 173xx` nvidia-utils-recent.tar.xz || return 1
- [ ! ${QUIET} == "y" ] && echo "overlay: Making ATI driver package"
- if [ ${VERBOSE} == "y" ]; then
- pacman -Sywd --config ${BASEDIR}/pacman.conf --cachedir `pwd` --noconfirm catalyst
- else
- pacman -Sywd --config ${BASEDIR}/pacman.conf --cachedir `pwd` --noconfirm catalyst &> /dev/null
- fi
- [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
- mv -f `ls catalyst-*.tar.*|grep -v utils` catalyst-recent.tar.xz || return 1
cd "${BASEDIR}"
[ ! ${QUIET} == "y" ] && echo "overlay: Finished preparing driver packages"
View
@@ -22,7 +22,7 @@ USECOLOR="yes"
MOD_AUTOLOAD="yes"
# TODO: The graphics modules here should be taken out after kernel 2.6.33
-MODULES=(!pcspkr !snd_pcsp !radeon !nouveau !ntfs !tpm_tis !tpm)
+MODULES=(!pcspkr !snd_pcsp !nouveau !ntfs !tpm_tis !tpm)
HOSTNAME="lg-live"
INTERFACES=($DISABLE_INTERFACES)
View
@@ -137,7 +137,7 @@ else
fi
# License for proprietary drivers
-LICENSE()
+license()
{
dialog --msgbox "$(cat /opt/drivers/closed_source_info.txt)" 22 71
if [ "$1" == "nv" ]
@@ -167,84 +167,70 @@ opendriver()
echo ' Identifier "Nvidia card"' >> /etc/X11/xorg.conf.d/20-nouveau.conf
echo ' Driver "nouveau"' >> /etc/X11/xorg.conf.d/20-nouveau.conf
echo 'EndSection' >> /etc/X11/xorg.conf.d/20-nouveau.conf
- else
- CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
- if [ "$CARD" != "" ]; then
- # we've got an ati card
- echo "Using radeon"
- modprobe --first-time radeon
- sleep 1
- fi
+# else
+# CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
+# if [ "$CARD" != "" ]; then
+# # we've got an ati card
+# echo "Using radeon"
+# modprobe --first-time radeon
+# sleep 1
+# fi
fi
exit
}
# Enable the user to force a driver in case our .ids don't match any devices
-forcedriver()
-{
- dialog --nocancel --menu "Your graphics card hardware could not be auto-detected. This usually means your graphics card is either very old or very recent. If you know your graphics cards brand, you can try to force it, otherwise use the open driver (the latter is recommended if you are unsure or if your graphics card is old):" 0 0 0 "opendriver" "Open Driver" "nvidia" "NVIDIA" "ati" "ATI" 2> /tmp/temp_forcedriver
- result=`cat /tmp/temp_forcedriver`
- if [ "$result" == "nvidia" ]; then
- LICENSE "nv"
- yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
- modprobe --first-time nvidia
- sleep 1
- exit
- elif [ "$result" == "ati" ]; then
- LICENSE "ati"
- yes | pacman -Udf /opt/drivers/catalyst-recent.tar.xz
- modprobe --first-time fglrx
- sleep 1
- #Xorg -configure
- mv /xorg.conf.new /etc/X11/xorg.conf
- aticonfig --initial
- exit
- elif [ "$result" == "opendriver" ]; then
- opendriver
- else
- opendriver
- fi
-}
+#forcedriver()
+#{
+# dialog --nocancel --menu "Your graphics card hardware could not be auto-detected. This usually means your graphics card is either very old or very recent. If you know your graphics cards brand, you can try to force it, otherwise use the open driver (the latter is recommended if you are unsure or if your graphics card is old):" 0 0 0 "opendriver" "Open Driver" "nvidia" "NVIDIA" "ati" "ATI" 2> /tmp/temp_forcedriver
+# result=`cat /tmp/temp_forcedriver`
+# if [ "$result" == "nvidia" ]; then
+# license "nv"
+# yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
+# modprobe --first-time nvidia
+# sleep 1
+# exit
+# elif [ "$result" == "ati" ]; then
+# opendriver
+# elif [ "$result" == "opendriver" ]; then
+# opendriver
+# else
+# opendriver
+# fi
+#}
# This is where the actual automatic checks begin
# The functions for the X stuff (starting with the license) above are only called here, not before
-CARD=$(lspci -n | sed -n "s/.* 0300: 10de:\(....\).*/\1/p")
+CARD=$(lspci -n | sed -n "s/.* 0300: 10de:\(....\).*/\1/p") # check for nvidia
if [ "$CARD" != "" ]; then
# we've got a nvidia card
# check if prelegacy or legacy
# if no prelegacy or legacy, we've got recent
if [ $(grep -i "$CARD" /opt/drivers/nvidia-legacy.ids) ]; then
- LICENSE "nv"
+ license "nv"
yes | pacman -Udf /opt/drivers/nvidia-utils-legacy.tar.xz /opt/drivers/nvidia-legacy.tar.xz
modprobe --first-time nvidia
sleep 1
exit
elif [ $(grep -i "$CARD" /opt/drivers/nvidia-prelegacy.ids) ]; then
opendriver
else
- LICENSE "nv"
+ license "nv"
yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
modprobe --first-time nvidia
sleep 1
exit
fi
-else
- CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
- if [ "$CARD" != "" ]; then
- # we've got an ati card
- # we're doing this in reverse for ATI because there is no older driver available to us anyway
- if [ $(grep -i "$CARD" /opt/drivers/ati-recent.ids) ]; then
- LICENSE "ati"
- yes | pacman -Udf /opt/drivers/catalyst-recent.tar.xz
- modprobe --first-time fglrx
- sleep 1
- Xorg -configure
- mv /xorg.conf.new /etc/X11/xorg.conf
- aticonfig --initial
- exit
- fi
- fi
+#else
+# CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p") # check for ati
+# if [ "$CARD" != "" ]; then
+# # we've got an ati card
+# opendriver
+# else
+# # we probably got intel, just call opendriver
+# opendriver
+# fi
fi
-forcedriver
+#forcedriver
# vim:ts=2:sw=2:expandtab
View
@@ -75,9 +75,3 @@ Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch
[community]
Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch
-
-#[archlinuxfr]
-#Server = http://repo.archlinux.fr/$arch
-
-[catalyst]
-Server = http://catalyst.apocalypsus.net/repo/catalyst/$arch

0 comments on commit 3baa92f

Please sign in to comment.