[Pkg-fglrx-devel] r396 - in fglrx-driver/trunk/debian: . patches
Patrick Matthäi
pmatthaei at alioth.debian.org
Thu Mar 25 18:38:26 UTC 2010
Author: pmatthaei
Date: 2010-03-25 18:38:06 +0000 (Thu, 25 Mar 2010)
New Revision: 396
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
Log:
* Please note: This release is in real the 10-4 pre-release.
* Refresh 05_fix_cmpxchg.diff, so that fglrx now realy builds with Linux
2.6.33.
Closes: #571272
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2010-03-22 17:26:32 UTC (rev 395)
+++ fglrx-driver/trunk/debian/changelog 2010-03-25 18:38:06 UTC (rev 396)
@@ -1,3 +1,12 @@
+fglrx-driver (1:10-3~prerelease-3) unstable; urgency=low
+
+ * Please note: This release is in real the 10-4 pre-release.
+ * Refresh 05_fix_cmpxchg.diff, so that fglrx now realy builds with Linux
+ 2.6.33.
+ Closes: #571272
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 25 Mar 2010 19:27:54 +0100
+
fglrx-driver (1:10-3~prerelease-2) unstable; urgency=low
* Add workaround, so that the i386 package, does not depend on a amd64
Modified: fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff 2010-03-22 17:26:32 UTC (rev 395)
+++ fglrx-driver/trunk/debian/patches/05_fix_cmpxchg.diff 2010-03-25 18:38:06 UTC (rev 396)
@@ -1,9 +1,58 @@
# Fix broken usage of internal macro; fixes compiling with 2.6.33
-diff -Naur fglrx-driver-10-2.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-2/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-2.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-02-17 20:34:34.000000000 +0100
-+++ fglrx-driver-10-2/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-02-24 21:23:51.580872456 +0100
-@@ -1472,7 +1472,16 @@
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/drmP.h fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/drmP.h
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/drmP.h 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/drmP.h 2010-03-25 19:34:40.000000000 +0100
+@@ -42,7 +42,12 @@
+ * can build the DRM (part of PI DRI). 4/21/2000 S + B */
+ #include <asm/current.h>
+ #endif /* __alpha__ */
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/miscdevice.h>
+@@ -51,7 +56,6 @@
+ #include <linux/init.h>
+ #include <linux/file.h>
+ #include <linux/pci.h>
+-#include <linux/version.h>
+ #include <linux/sched.h>
+ #include <linux/smp_lock.h> /* For (un)lock_kernel */
+ #include <linux/mm.h>
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/firegl_public.c 2010-03-25 19:34:02.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-03-25 19:34:40.000000000 +0100
+@@ -28,7 +28,11 @@
+ #error Kernel versions older than 2.6.0 are no longer supported by this module.
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+
+ #if !defined(CONFIG_X86)
+ #if !defined(CONFIG_X86_PC)
+@@ -165,8 +169,12 @@
+
+ // For 2.6.18 or higher, the UTS_RELEASE is defined in the linux/utsrelease.h.
+ #ifndef UTS_RELEASE
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/utsrelease.h>
++#else
+ #include <linux/utsrelease.h>
+ #endif
++#endif
+
+ #if defined(__i386__)
+ #ifndef do_div
+@@ -1472,7 +1480,16 @@
#ifndef __HAVE_ARCH_CMPXCHG
return __fgl_cmpxchg(ptr,old,new,size);
#else
@@ -21,3 +70,150 @@
#endif
}
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_acpi.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2010-03-25 19:34:40.000000000 +0100
+@@ -15,7 +15,11 @@
+ ****************************************************************************/
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/acpi.h>
+ #include <linux/pci.h>
+
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_agp.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_agp.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_agp.c 2010-03-25 19:34:40.000000000 +0100
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+ #include <linux/agp_backend.h>
+ #include <linux/string.h>
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_io.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_io.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_io.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_io.c 2010-03-25 19:34:40.000000000 +0100
+@@ -37,7 +37,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/poll.h>
+ #include <linux/signal.h>
+ #include <asm/io.h>
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_osconfig.h 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_osconfig.h 2010-03-25 19:34:40.000000000 +0100
+@@ -20,7 +20,11 @@
+ #define KCL_OSCONFIG_H
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+
+ // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
+ #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_pci.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_pci.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_pci.c 2010-03-25 19:34:40.000000000 +0100
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+
+ #include "kcl_config.h"
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_str.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_str.c 2010-03-25 19:34:40.000000000 +0100
+@@ -30,7 +30,12 @@
+ *
+ */
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/string.h>
+ #include <linux/module.h>
+
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_wait.c
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-03-25 19:34:40.000000000 +0100
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
+diff -Naur fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/make.sh fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/make.sh
+--- fglrx-driver-10-2+8.721.orig//common/lib/modules/fglrx/build_mod/make.sh 2010-03-11 22:08:48.000000000 +0100
++++ fglrx-driver-10-2+8.721/common/lib/modules/fglrx/build_mod/make.sh 2010-03-25 19:34:40.000000000 +0100
+@@ -218,8 +218,15 @@
+ # UTS-define is in external version-*.h files, i.e. linux-2.2.14-5.0-RedHat does this flaw
+ kernel_release=`cat $linuxincludes/linux/version-*.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
+ else
+- # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
+- kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h 2>/dev/null | grep UTS_RELEASE -c`
++
++ if [ $UTS_REL_COUNT -gt 0 ]; then
++ # 2.6.33+
++ kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ else
++ # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
++ kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ fi
+ fi
+ fi
+ fi
+@@ -302,7 +309,8 @@
+ # 3
+ # linux/autoconf.h may contain this: #define CONFIG_SMP 1
+
+-src_file=$linuxincludes/linux/autoconf.h
++src_file=$linuxincludes/generated/autoconf.h
++[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
+
+ if [ ! -e $src_file ]; then
+ echo "Warning:" >> $logfile
+@@ -355,7 +363,8 @@
+ MODVERSIONS=0
+
+ # linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
+-src_file=$linuxincludes/linux/autoconf.h
++src_file=$linuxincludes/generated/autoconf.h
++[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
+ if [ ! -e $src_file ];
+ then
+ echo "Warning:" >> $logfile
More information about the Pkg-fglrx-devel
mailing list