[Pkg-fglrx-devel] r714 - in fglrx-driver/branches/resurrect-fglrx-source/debian: . module

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-09 18:34:00 +0000 (Tue, 09 Aug 2011)
New Revision: 714

Modified:
   fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in
   fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
Log:
drop linux-2.4 support, gain linux-3 support

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in	2011-08-09 16:41:45 UTC (rev 713)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in	2011-08-09 18:34:00 UTC (rev 714)
@@ -1,9 +1,9 @@
 common/lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
 common/lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
-common/lib/modules/fglrx/build_mod/*.sh usr/src/modules/fglrx/
 common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
+arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/
 debian/changelog usr/src/modules/fglrx/debian/
 debian/copyright usr/src/modules/fglrx/debian/
 debian/compat usr/src/modules/fglrx/debian/
 debian/module/* usr/src/modules/fglrx/debian/
-debian/reportbug/script usr/share/bug/fglrx-source/
+debian/bug-script usr/src/modules/fglrx/debian/

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules	2011-08-09 16:41:45 UTC (rev 713)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules	2011-08-09 18:34:00 UTC (rev 714)
@@ -33,12 +33,7 @@
 KSRC  := $(KSRC)
 KVERS := ${KVERS}
 
-BASEVERS := $(shell echo $(KVERS) | cut -d. -f-2)
-ifeq ($(BASEVERS),2.6)
 module=fglrx.ko
-else
-module=fglrx.o
-endif
 
 CHANGES_FILE=$(KPKG_DEST_DIR)/fglrx-kernel-$(KVERS)_$(PKG_VERSION)_$(ARCH).changes
 
@@ -51,13 +46,9 @@
 	dh_testdir
 	touch configure-stamp
 
-build: configure-stamp make.sh
+build: configure-stamp
 	dh_testdir
-ifeq ($(BASEVERS),2.6)
 	$(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
-else
-	KERNEL_PATH=$(KSRC) uname_r=$(KVERS) ./make.sh --nohints
-endif
 
 install: build
 	dh_testdir