[Pkg-fglrx-devel] r728 - in fglrx-driver/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-18 08:01:59 +0000 (Thu, 18 Aug 2011)
New Revision: 728

Added:
   fglrx-driver/trunk/debian/patches/04-build-x86_64-on-x86.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
   fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
   fglrx-driver/trunk/debian/patches/series
Log:
merge support for building the 64-bit kernel module in 32-bit userspace into trunk

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-18 07:43:39 UTC (rev 727)
+++ fglrx-driver/trunk/debian/changelog	2011-08-18 08:01:59 UTC (rev 728)
@@ -1,3 +1,13 @@
+fglrx-driver (1:11-8-2) UNRELEASED; urgency=low
+
+  [ Andreas Beckmann ]
+  * Include libfglrx_ip.a for both architectures in the module source.
+  * Add patch 04-build-x86_64-on-x86.diff: add support for building the 64-bit
+    kernel module in 32-bit userspace, i.e. for linux-image-*-amd64 on i386.
+    (Closes: #636055)
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Thu, 18 Aug 2011 09:46:11 +0200
+
 fglrx-driver (1:11-8-1) unstable; urgency=low
 
   [ Michael Gilbert ]

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in	2011-08-18 07:43:39 UTC (rev 727)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in	2011-08-18 08:01:59 UTC (rev 728)
@@ -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/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-18 07:43:39 UTC (rev 727)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-18 08:01:59 UTC (rev 728)
@@ -1,5 +1,10 @@
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a aquired acquired
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
-unstripped-binary-or-object usr/src/fglrx-_VERSION_/libfglrx_ip.a
+[i386]: binary-from-other-architecture usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a aquired acquired
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a aquired acquired
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
+unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a
+unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
 no-upstream-changelog

Copied: fglrx-driver/trunk/debian/patches/04-build-x86_64-on-x86.diff (from rev 717, fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff)
===================================================================
--- fglrx-driver/trunk/debian/patches/04-build-x86_64-on-x86.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/04-build-x86_64-on-x86.diff	2011-08-18 08:01:59 UTC (rev 728)
@@ -0,0 +1,19 @@
+Author: Andreas Beckmann <debian at abeckmann.de>
+Description: select the libfglrx_ip.a based on the target kernel architecture
+ Together with shipping libfglrx_ip.a for both architectures, this allows to
+ build the kernel module for linux-image-*-amd64 on i386.
+ No guarantees that the 32-bit userspace driver works on a 64-bit kernel.
+
+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/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-08-18 07:43:39 UTC (rev 727)
+++ fglrx-driver/trunk/debian/patches/series	2011-08-18 08:01:59 UTC (rev 728)
@@ -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