[Pkg-fglrx-devel] r716 - in fglrx-driver/branches/resurrect-fglrx-source/debian: . patches

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-10 00:53:09 +0000 (Wed, 10 Aug 2011)
New Revision: 716

Added:
   fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff
Modified:
   fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
   fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in
   fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in
   fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series
Log:
Add support for building the 64-bit kernel module in 32-bit userspace.

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-09 20:33:20 UTC (rev 715)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-10 00:53:09 UTC (rev 716)
@@ -4,6 +4,7 @@
   * Add more copyright statements and licenses to debian/copyright.
   * Let dh_installmodules handle the modprobe blacklist config.
   * Resurrect the fglrx-source package.
+  * Add support for building the 64-bit kernel module in 32-bit userspace.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in	2011-08-09 20:33:20 UTC (rev 715)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in	2011-08-10 00:53:09 UTC (rev 716)
@@ -2,4 +2,5 @@
 common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-_VERSION_/
 common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-_VERSION_/
 debian/dkms.conf usr/src/fglrx-_VERSION_/
-arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/
+arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86/
+arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86_64/

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in	2011-08-09 20:33:20 UTC (rev 715)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in	2011-08-10 00:53:09 UTC (rev 716)
@@ -1,7 +1,8 @@
 common/lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
 common/lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
 common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
-arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/
+arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/x86/
+arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/x86_64/
 debian/changelog usr/src/modules/fglrx/debian/
 debian/copyright usr/src/modules/fglrx/debian/
 debian/compat usr/src/modules/fglrx/debian/

Added: fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff	                        (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff	2011-08-10 00:53:09 UTC (rev 716)
@@ -0,0 +1,13 @@
+Index: b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
+===================================================================
+--- a/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2011-08-10 02:24:53.439417802 +0200
++++ b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2011-08-10 02:28:11.395916634 +0200
+@@ -27,7 +27,7 @@
+ LIBIP_PREFIX	?= ..
+ 
+ obj-m           += fglrx.o
+-fglrx-libs      += libfglrx_ip.a
++fglrx-libs      += $(if $(filter y,$(CONFIG_X86_64)),x86_64/,x86/)libfglrx_ip.a
+ 
+ fglrx-c-objs    += firegl_public.o      \
+                    kcl_acpi.o           \

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series	2011-08-09 20:33:20 UTC (rev 715)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series	2011-08-10 00:53:09 UTC (rev 716)
@@ -1,3 +1,4 @@
 01-CONFIG_X86_XEN.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
+04-build-x86_64-on-x86.diff