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

[Michael Gilbert]

Author: gilbert-guest
Date: 2010-09-23 03:00:14 +0000 (Thu, 23 Sep 2010)
New Revision: 487

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch
Log:
use a kernel headers path that's also available to locally built kernels

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-09-23 03:00:01 UTC (rev 486)
+++ fglrx-driver/trunk/debian/changelog	2010-09-23 03:00:14 UTC (rev 487)
@@ -2,8 +2,10 @@
 
   * Avoid attempting to build dkms modules for virtual linux-image packages
     (closes: #597792).
+  * Use a kernel headers path that's also available to locally built kernels
+    (closes: #597783).
 
- -- Michael Gilbert <michael.s.gilbert at gmail.com>  Wed, 22 Sep 2010 22:45:40 -0400
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Wed, 22 Sep 2010 22:58:52 -0400
 
 fglrx-driver (1:10-9-2) unstable; urgency=high
 

Modified: fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch	2010-09-23 03:00:01 UTC (rev 486)
+++ fglrx-driver/trunk/debian/patches/04-dkms-compat_alloc_user_space-rename.patch	2010-09-23 03:00:14 UTC (rev 487)
@@ -28,12 +28,12 @@
 Index: fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
 ===================================================================
 --- fglrx-driver-10-9.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-21 00:59:27.000000000 -0400
-+++ fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-21 01:02:41.000000000 -0400
++++ fglrx-driver-10-9/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2010-09-22 21:43:54.000000000 -0400
 @@ -66,6 +66,7 @@
                  -DFGL_GART_RESERVED_SLOT \
                  -DFGL_LINUX253P1_VMA_API \
                  -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DARCH_COMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /usr/src/linux-headers-$(KERNELRELEASE)/Module.symvers ; then echo 1 ; else echo 0 ; fi) \
++                -DARCH_COMPAT_ALLOC_USER_SPACE=$(shell if grep -q compat_alloc_user_space /lib/modules/$(KERNELRELEASE)/build/Module.symvers ; then echo 1 ; else echo 0 ; fi) \
  
  ifeq ($(KERNELRELEASE),)
  # on first call from remote location we get into this path