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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-10 09:54:22 +0000 (Wed, 10 Aug 2011)
New Revision: 717

Modified:
   fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
   fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in
   fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff
   fglrx-driver/branches/resurrect-fglrx-source/debian/rules
Log:
unbreak dkms build with amd64-on-i386 support

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-10 00:53:09 UTC (rev 716)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-10 09:54:22 UTC (rev 717)
@@ -4,7 +4,10 @@
   * 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.
+  * 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>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-10 00:53:09 UTC (rev 716)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-10 09:54:22 UTC (rev 717)
@@ -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

Modified: 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	2011-08-10 00:53:09 UTC (rev 716)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff	2011-08-10 09:54:22 UTC (rev 717)
@@ -1,3 +1,9 @@
+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

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/rules	2011-08-10 00:53:09 UTC (rev 716)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/rules	2011-08-10 09:54:22 UTC (rev 717)
@@ -55,8 +55,7 @@
 	chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
 	chmod -x debian/fglrx-control/usr/share/icons/*
 	chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
-	chmod -x debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)/*
-	chmod -x debian/fglrx-source/usr/src/modules/fglrx/*
+	chmod -R a-sx,u=rwX,go=rX debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)
 	chmod -R a-sx,u=rwX,go=rX debian/fglrx-source/usr/src/modules/fglrx
 	chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
 	tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \