projects / fglrx-packaging.git / commitdiff
Build Results
 
Summary

Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Thu 2/4/10 2:39
Mario Limonciello  
Convert to alternatives... 
Thu 2/4/10 1:55
Mario Limonciello  
Drop old kdelnk file... 
Thu 2/4/10 0:49
Mario Limonciello  
Drop arch stuff for fglrx... 
Wed 2/3/10 1:56
Mario Limonciello  
Migrate over to dh7. No... 
Wed 2/3/10 1:22
Mario Limonciello  
Bump standard version for... 
Sat 1/30/10 16:05
Anssi Hannula  
Mandriva: adapt for... 
 
> --git a/Mandriva/ati-8.32.5-uname_r.patch b/Mandriva/ati-8.32.5-uname_r.patch
deleted file mode 100644
index 9a6ef81
..0000000
--- a/Mandriva/ati-8.32.5-uname_r.patch
+++ /dev/null
@@ -1,20 +0,@@
---- 
ati-8.32.5/common/lib/modules/fglrx/build_mod/make.sh.orig    2006-12-13 06:12:38.000000000 +0200
-+++ ati-8.32.5/common/lib/modules/fglrx/build_mod/make.sh    2006-12-16 16:44:43.000000000 +0200
-@@ -71,+71,@@ fi
-
# ==============================================================
# system/kernel identification
--uname_r=`uname -r`
-+[[ -
"$uname_r" ]] && uname_r=`uname -r`
uname_v=`uname -v`
uname_s=`uname -s`
uname_m=`uname -m`
-@@ -
940,+940,@@ if [ $kernel_is_26x -gt 0 ]; then
-     make CC=${CCV=${V
-     
LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" sed -'s|^\([^/]\)|../\1|'
-     
MODFLAGS="-DMODULE $def_for_all $def_smp $def_modversions" 
--    PAGE_ATTR_FIX=$PAGE_ATTR_FIX tlog 2>&1
-+    PAGE_ATTR_FIX=$PAGE_ATTR_FIX KVER=$uname_r KDIR=$KERNEL_PATH tlog 2>&1
-     res=$?
-     
tee -a $logfile tlog
-     #delete tlog
diff --git a/Mandriva/fglrx-uname_r.patch b/Mandriva/fglrx-uname_r.patch
new file mode 100644
index 0000000..144a51f
--- /dev/null
+++ b/Mandriva/fglrx-uname_r.patch
@@ -0,+1,22 @@
+
Indexati-8.55_RC1/common/lib/modules/fglrx/build_mod/make.sh
+===================================================================
+--- 
ati-8.55_RC1/common/lib/modules/fglrx/build_mod/make.sh
++++ ati-8.55_RC1/common/lib/modules/fglrx/build_mod/make.sh    2008-10-18 16:00:12.000000000 +0300
+@@ -62,+62,@@
# ==============================================================
# system/kernel identification
+
+-
uname_r=`uname -r`
++[[ -
"$uname_r" ]] && uname_r=`uname -r`
uname_v=`uname -v`
+
# ==============================================================
+@@ -349,+349,@@
make CC=${CC
+     
LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" sed -'s|^\([^/]\)|../\1|'
+     
MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX $def_smp $def_modversions" 
+-    PAGE_ATTR_FIX=$PAGE_ATTR_FIX 
++    PAGE_ATTR_FIX=$PAGE_ATTR_FIX KVER=$uname_r KDIR=$KERNEL_PATH 
+     > tlog 2>&1
+
res=$?
diff --git a/Mandriva/fglrx.spec b/Mandriva/fglrx.spec
index a3ea229
..a1aec70 100644
--- a/Mandriva/fglrx.spec
+++ b/Mandriva/fglrx.spec
@@ -98,+98,@@ Source2:    atieventsd.init
 
# (for manual use)
 
Source10:    generate-fglrx-spec-from-svn.sh
 
%endif
-
Patch0:        ati-8.32.5-uname_r.patch
+Patch0:        fglrx-uname_r.patch
 
%if !%{atibuild}
 
Patch1:        ati-8.19.10-fglrx_gamma-extutil-include.patch
 Patch2
:        ati-8.19.10-fgl_glxgears-includes.
 
Phoronix.com
Linux Driver Forums
Copyright © 2010 by Phoronix Media