Skip to content
This repository
Browse code

Completely removing any catalyst functionality - free drivers will ha…

…ve to do
  • Loading branch information...
commit 3baa92faf55a44770fbe4b47b57e7dda3b1e74b6 1 parent d07fe2b
Sven-Hendrik Haase authored April 29, 2011
8  buildscript.sh
@@ -100,14 +100,6 @@ overlay ()
100 100
   mv -f `ls nvidia-*pkg.tar.*|grep -v utils|grep -v 173xx` nvidia-recent.tar.xz || return 1
101 101
   mv -f `ls nvidia-*pkg.tar.*|grep utils|grep -v 173xx` nvidia-utils-recent.tar.xz || return 1
102 102
 
103  
-  [ ! ${QUIET} == "y" ] && echo "overlay: Making ATI driver package"
104  
-  if [ ${VERBOSE} == "y" ]; then
105  
-    pacman -Sywd --config ${BASEDIR}/pacman.conf --cachedir `pwd` --noconfirm catalyst
106  
-  else
107  
-    pacman -Sywd --config ${BASEDIR}/pacman.conf --cachedir `pwd` --noconfirm catalyst &> /dev/null
108  
-  fi
109  
-  [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
110  
-  mv -f `ls catalyst-*.tar.*|grep -v utils` catalyst-recent.tar.xz || return 1
111 103
   cd "${BASEDIR}"
112 104
   [ ! ${QUIET} == "y" ] && echo "overlay: Finished preparing driver packages"
113 105
 
2  overlay/etc/rc.conf
@@ -22,7 +22,7 @@ USECOLOR="yes"
22 22
 
23 23
 MOD_AUTOLOAD="yes"
24 24
 # TODO: The graphics modules here should be taken out after kernel 2.6.33
25  
-MODULES=(!pcspkr !snd_pcsp !radeon !nouveau !ntfs !tpm_tis !tpm)
  25
+MODULES=(!pcspkr !snd_pcsp !nouveau !ntfs !tpm_tis !tpm)
26 26
 HOSTNAME="lg-live"
27 27
 
28 28
 INTERFACES=($DISABLE_INTERFACES)
94  overlay/etc/rc.local
@@ -137,7 +137,7 @@ else
137 137
 fi       
138 138
 
139 139
 # License for proprietary drivers
140  
-LICENSE()
  140
+license()
141 141
 {
142 142
   dialog --msgbox "$(cat /opt/drivers/closed_source_info.txt)" 22 71
143 143
   if [ "$1" == "nv" ]
@@ -167,54 +167,47 @@ opendriver()
167 167
     echo '    Identifier "Nvidia card"' >> /etc/X11/xorg.conf.d/20-nouveau.conf
168 168
     echo '    Driver "nouveau"' >> /etc/X11/xorg.conf.d/20-nouveau.conf
169 169
     echo 'EndSection' >> /etc/X11/xorg.conf.d/20-nouveau.conf
170  
-  else
171  
-    CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
172  
-    if [ "$CARD" != "" ]; then
173  
-      # we've got an ati card
174  
-      echo "Using radeon"
175  
-      modprobe --first-time radeon
176  
-      sleep 1
177  
-    fi
  170
+#  else
  171
+#    CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
  172
+#    if [ "$CARD" != "" ]; then
  173
+#      # we've got an ati card
  174
+#      echo "Using radeon"
  175
+#      modprobe --first-time radeon
  176
+#      sleep 1
  177
+#    fi
178 178
   fi
179 179
   exit
180 180
 }
181 181
 
182 182
 # Enable the user to force a driver in case our .ids don't match any devices
183  
-forcedriver()
184  
-{
185  
-  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
186  
-  result=`cat /tmp/temp_forcedriver`
187  
-  if [ "$result" == "nvidia" ]; then
188  
-    LICENSE "nv"
189  
-    yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
190  
-    modprobe --first-time nvidia
191  
-    sleep 1
192  
-    exit
193  
-  elif [ "$result" == "ati" ]; then
194  
-    LICENSE "ati"
195  
-    yes | pacman -Udf /opt/drivers/catalyst-recent.tar.xz
196  
-    modprobe --first-time fglrx
197  
-    sleep 1
198  
-    #Xorg -configure
199  
-    mv /xorg.conf.new /etc/X11/xorg.conf
200  
-    aticonfig --initial
201  
-    exit
202  
-  elif [ "$result" == "opendriver" ]; then
203  
-    opendriver
204  
-  else
205  
-    opendriver
206  
-  fi
207  
-}
  183
+#forcedriver()
  184
+#{
  185
+#  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
  186
+#  result=`cat /tmp/temp_forcedriver`
  187
+#  if [ "$result" == "nvidia" ]; then
  188
+#    license "nv"
  189
+#    yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
  190
+#    modprobe --first-time nvidia
  191
+#    sleep 1
  192
+#    exit
  193
+#  elif [ "$result" == "ati" ]; then
  194
+#    opendriver
  195
+#  elif [ "$result" == "opendriver" ]; then
  196
+#    opendriver
  197
+#  else
  198
+#    opendriver
  199
+#  fi
  200
+#}
208 201
 
209 202
 # This is where the actual automatic checks begin
210 203
 # The functions for the X stuff (starting with the license) above are only called here, not before
211  
-CARD=$(lspci -n | sed -n "s/.* 0300: 10de:\(....\).*/\1/p")
  204
+CARD=$(lspci -n | sed -n "s/.* 0300: 10de:\(....\).*/\1/p") # check for nvidia
212 205
 if [ "$CARD" != "" ]; then
213 206
   # we've got a nvidia card
214 207
   # check if prelegacy or legacy
215 208
   # if no prelegacy or legacy, we've got recent
216 209
   if [ $(grep -i "$CARD" /opt/drivers/nvidia-legacy.ids) ]; then
217  
-    LICENSE "nv"
  210
+    license "nv"
218 211
     yes | pacman -Udf /opt/drivers/nvidia-utils-legacy.tar.xz /opt/drivers/nvidia-legacy.tar.xz
219 212
     modprobe --first-time nvidia
220 213
     sleep 1
@@ -222,29 +215,22 @@ if [ "$CARD" != "" ]; then
222 215
   elif [ $(grep -i "$CARD" /opt/drivers/nvidia-prelegacy.ids) ]; then
223 216
     opendriver
224 217
   else 
225  
-    LICENSE "nv"
  218
+    license "nv"
226 219
     yes | pacman -Udf /opt/drivers/nvidia-utils-recent.tar.xz /opt/drivers/nvidia-recent.tar.xz
227 220
     modprobe --first-time nvidia
228 221
     sleep 1
229 222
     exit
230 223
   fi
231  
-else
232  
-  CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p")
233  
-  if [ "$CARD" != "" ]; then
234  
-    # we've got an ati card
235  
-    # we're doing this in reverse for ATI because there is no older driver available to us anyway
236  
-    if [ $(grep -i "$CARD" /opt/drivers/ati-recent.ids) ]; then
237  
-      LICENSE "ati"
238  
-      yes | pacman -Udf /opt/drivers/catalyst-recent.tar.xz
239  
-      modprobe --first-time fglrx
240  
-      sleep 1
241  
-      Xorg -configure
242  
-      mv /xorg.conf.new /etc/X11/xorg.conf
243  
-      aticonfig --initial
244  
-      exit
245  
-    fi
246  
-  fi
  224
+#else
  225
+#  CARD=$(lspci -n | sed -n "s/.* 0300: 1002:\(....\).*/\1/p") # check for ati
  226
+#  if [ "$CARD" != "" ]; then
  227
+#    # we've got an ati card
  228
+#    opendriver
  229
+#  else
  230
+#    # we probably got intel, just call opendriver
  231
+#    opendriver
  232
+#  fi
247 233
 fi
248  
-forcedriver
  234
+#forcedriver
249 235
 
250 236
 # vim:ts=2:sw=2:expandtab
6  pacman.conf
@@ -75,9 +75,3 @@ Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch
75 75
 
76 76
 [community]
77 77
 Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/$arch
78  
-
79  
-#[archlinuxfr]
80  
-#Server = http://repo.archlinux.fr/$arch
81  
-
82  
-[catalyst]
83  
-Server = http://catalyst.apocalypsus.net/repo/catalyst/$arch

0 notes on commit 3baa92f

Please sign in to comment.
Something went wrong with that request. Please try again.