[Pkg-fglrx-devel] r432 - in fglrx-driver/trunk/debian: . dkms

[Michael Gilbert]

Author: gilbert-guest
Date: 2010-07-26 02:58:45 +0000 (Mon, 26 Jul 2010)
New Revision: 432

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/dkms/dkms.conf.template
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install
   fglrx-driver/trunk/debian/rules
Log:
fix dkms issue

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2010-07-08 16:03:11 UTC (rev 431)
+++ fglrx-driver/trunk/debian/changelog	2010-07-26 02:58:45 UTC (rev 432)
@@ -1,6 +1,9 @@
 fglrx-driver (1:10-6-2) UNRELEASED; urgency=low
 
   [ Michael Gilbert ]
+  * Use fglrx module makefile instead of its make.sh script (this has the
+    added bonus of making dkms autoupdate for all installed kernels; thus
+    making module rebuilds for ABI bumps automatic).
   * Fix typo in atiode manpage.
     Closes: #586808
 

Modified: fglrx-driver/trunk/debian/dkms/dkms.conf.template
===================================================================
--- fglrx-driver/trunk/debian/dkms/dkms.conf.template	2010-07-08 16:03:11 UTC (rev 431)
+++ fglrx-driver/trunk/debian/dkms/dkms.conf.template	2010-07-26 02:58:45 UTC (rev 432)
@@ -1,8 +1,6 @@
 PACKAGE_NAME="fglrx"
 PACKAGE_VERSION="_VERSION_"
 BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
-DEST_MODULE_LOCATION[0]="/updates/dkms/"
+DEST_MODULE_LOCATION[0]="/updates"
 AUTOINSTALL=yes
-PRE_BUILD="chmod 0755 ${dkms_tree}/fglrx/_VERSION_/build/2.6.x"
-MAKE[0]="pushd ${dkms_tree}/fglrx/_VERSION_/build; sh make.sh --nohints --norootcheck; popd"
 CLEAN="rm -f *.*o"

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2010-07-08 16:03:11 UTC (rev 431)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2010-07-26 02:58:45 UTC (rev 432)
@@ -1,5 +1,5 @@
 common/lib/modules/fglrx/build_mod/*.c usr/src/fglrx-VERSION/
 common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-VERSION/
 common/lib/modules/fglrx/build_mod/*.sh usr/src/fglrx-VERSION/
-common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/2.6.x/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/
 debian/reportbug/script usr/share/bug/fglrx-modules-dkms/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2010-07-08 16:03:11 UTC (rev 431)
+++ fglrx-driver/trunk/debian/rules	2010-07-26 02:58:45 UTC (rev 432)
@@ -123,9 +123,6 @@
 	# Rename the DKMSBASE to DKMSSRCDIR and fix permissions.
 	mv debian/$(PKG_dkms)/$(DKMSBASE) debian/$(PKG_dkms)/$(DKMSSRCDIR)
 	chmod -x debian/$(PKG_dkms)/$(DKMSSRCDIR)/*
-	chmod 0755 debian/$(PKG_dkms)/$(DKMSSRCDIR)/2.6.x
-	chmod 0755 debian/$(PKG_dkms)/$(DKMSSRCDIR)/make.sh
-	chmod -x debian/$(PKG_dkms)/$(DKMSSRCDIR)/2.6.x/Makefile
 	# Create symlinks to shared libs; fixes a lintian error.
 	/sbin/ldconfig -n debian/$(PKG_glx)/usr/lib
 	/sbin/ldconfig -n debian/$(PKG_glx_ia32)/usr/lib32