[Lunar-commits] r21549 - moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx

[Auke Kok]

Author: sofar
Date: 2006-09-23 17:53:49 +0000 (Sat, 23 Sep 2006)
New Revision: 21549

Modified:
   moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/BUILD
   moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/DETAILS
Log:
Fixed this and update to 8.29.x - it now installed just fine again! :)


Modified: moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/BUILD
===================================================================
--- moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/BUILD	2006-09-23 17:37:30 UTC (rev 21548)
+++ moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/BUILD	2006-09-23 17:53:49 UTC (rev 21549)
@@ -1,8 +1,14 @@
 (
 
   export X_VERSION="x690"
+  export KERNEL_PATH="/usr/src/linux"
 
-  KERNEL_VERSION=$(grep UTS_RELEASE /usr/src/linux/include/linux/version.h  | cut -d'"' -f2)
+  KERNEL_VERSION=$(if [ -f /usr/src/linux/include/linux/utsrelease.h ]; then
+      grep UTS_RELEASE /usr/src/linux/include/linux/utsrelease.h | cut -d'"' -f2
+    else
+      grep UTS_RELEASE /usr/src/linux/include/linux/version.h | cut -d'"' -f2
+    fi)
+
   if echo $KERNEL_VERSION | grep -q '^2.6' ; then
     MOD_EXT=ko
   else
@@ -13,14 +19,12 @@
   find . -type d -exec chmod 755 {} \; &&
 
   # hacked together:
-  cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
-  sh make.sh &&
+  cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod/2.6.x &&
+  make KVER="$KERNEL_VERSION" &&
   prepare_install &&
   cd $SOURCE_DIRECTORY/lib/modules/fglrx &&
   mkdir -p /lib/modules/${KERNEL_VERSION}/drivers/char/drm &&
-  mkdir -p /lib/modules/${KERNEL_VERSION}/drivers/char/agp &&
-  install -m 644 fglrx.${KERNEL_VERSION}.${MOD_EXT} /lib/modules/${KERNEL_VERSION}/drivers/char/drm/fglrx.${MOD_EXT} &&
-  install -m 644 fglrx_agp.${KERNEL_VERSION}.${MOD_EXT} /lib/modules/${KERNEL_VERSION}/drivers/char/agp/fglrx_agp.${MOD_EXT} &&
+  install -m 644 build_mod/2.6.x/fglrx.${MOD_EXT} /lib/modules/${KERNEL_VERSION}/drivers/char/drm/fglrx.${MOD_EXT} &&
   cd $SOURCE_DIRECTORY &&
   install -m755 usr/X11R6/bin/fgl* /usr/bin/ &&
   install -m755 usr/X11R6/bin/aticonfig /usr/bin/ &&

Modified: moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/DETAILS
===================================================================
--- moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/DETAILS	2006-09-23 17:37:30 UTC (rev 21548)
+++ moonbase/trunk/zbeta/xorg-7.0/x11-drivers/xf86-video-fglrx/DETAILS	2006-09-23 17:53:49 UTC (rev 21549)
@@ -1,12 +1,11 @@
           MODULE=xf86-video-fglrx
-         VERSION=8.24.8
+         VERSION=8.29.6
          LICENSE=proprietary
           SOURCE=fglrx_6_8_0-$VERSION-1.i386.rpm
-      SOURCE_URL=$MIRROR_URL
-      SOURCE_VFY=sha1:fe3c561da7aabd167d74091bdac99f5ef0753520
+      SOURCE_URL=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/
         WEB_SITE=http://www.ati.com/
          ENTERED=20060522
-         UPDATED=20060522
+         UPDATED=20060923
            SHORT="proprietary ati driver for xorg7"
 cat << EOF
 Proprietary X.Org driver for the ATI 8500 and 9x00 series. Contains