[Pkg-fglrx-devel] r486 - fglrx-driver/trunk/debian

[Michael Gilbert]

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

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst
Log:
avoid attempting to build dkms modules for virtual linux-image packages

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-09-21 18:37:58 UTC (rev 485)
+++ fglrx-driver/trunk/debian/changelog	2010-09-23 03:00:01 UTC (rev 486)
@@ -1,3 +1,10 @@
+fglrx-driver (1:10-9-3) UNRELEASED; urgency=high
+
+  * Avoid attempting to build dkms modules for virtual linux-image packages
+    (closes: #597792).
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Wed, 22 Sep 2010 22:45:40 -0400
+
 fglrx-driver (1:10-9-2) unstable; urgency=high
 
   * Use arch_compat_alloc_user_space in place of the now unavailable

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst	2010-09-21 18:37:58 UTC (rev 485)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst	2010-09-23 03:00:01 UTC (rev 486)
@@ -14,9 +14,12 @@
 fi
 
 if [ "$1" = "configure" ] ; then
-	dpkg -l | grep ^ii | cut -d' ' -f3 | grep ^linux-image | cut -d- -f3- | while read kversion ; do
-		dkms build -m fglrx -v $version -k $kversion || true
-		dkms install -m fglrx -v $version -k $kversion --force || true
+	cd /lib/modules
+	ls | while read kversion ; do
+		if [ -e $kversion/build/include/linux/version.h ] ; then
+			dkms build -m fglrx -v $version -k $kversion || true
+			dkms install -m fglrx -v $version -k $kversion --force || true
+		fi
 	done
 fi