r2967 - in trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian: . patches

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-04-10 21:35:57 +0000 (Sun, 10 Apr 2005)
New Revision: 2967

Added:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch
Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules
Log:
Added patch for the Makefile to not build smctr on amd64.
Added amd64 specific MAKEFLAGS handling to the rules and rules.modules files.


Added: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch	2005-04-10 18:13:19 UTC (rev 2966)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch	2005-04-10 21:35:57 UTC (rev 2967)
@@ -0,0 +1,13 @@
+--- Makefile	2005-04-10 19:27:09.000000000 +0200
++++ Makefile.new	2005-04-04 22:49:13.000000000 +0200
+@@ -1,7 +1,10 @@
+ DIR ?= /usr/src/linux
+ 
++ifneq ($(DEB_HOST_ARCH), amd64)
+ EXTRA_CFLAGS += -DCONFIG_SMCTR=1
+ obj-m 	+= smctr.o
++endif
++
+ EXTRA_CFLAGS += -DCONFIG_DGRS=1
+ obj-m += dgrs.o
+ EXTRA_CFLAGS += -DCONFIG_ACENIC=1

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-04-10 18:13:19 UTC (rev 2966)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-04-10 21:35:57 UTC (rev 2967)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
+
 # the archs, subarchs and flavours we are building for
 archs := $(shell grep ^archs: debian/flavours | sed -e 's/^archs: *//')
 arch := $(DEB_HOST_ARCH)
@@ -15,6 +16,9 @@
 #| some files in debian/ get version numbers and stuff updated on the fly
 M4 = m4 -DM4UPSTREAM="$(upstram)" -DM4ABI="$(abi)" -DM4ARCH="$(arch)" -DM4SUBARCH="$(subarch)" -DM4FLAVOUR="$(flavour)"
 
+ifeq ($(DEB_HOST_ARCH), amd64)
+makeflags := "CC=gcc-3.4 V=1"
+endif
 mod-src-dir:
 	mkdir -p modules/kernel-nonfree-source/debian
 	cp -ra *.[ch] Makefile debian modules/kernel-nonfree-source
@@ -28,7 +32,7 @@
 
 $(patsubst %,build/%,$(DEB_ARCH_PACKAGES)):: mod-src-dir
 	cd modules/kernel-nonfree-source && \
-		fakeroot debian/rules binary-modules kdist_clean \
+		fakeroot debian/rules binary-modules kdist_clean MAKEFLAGS=$(makeflags) \
 		KSRC=/usr/src/$(patsubst build/kernel-nonfree-modules-%,kernel-headers-%,$@) DEB_DESTDIR=$(CURDIR)
 
 $(patsubst %,binary/%,$(DEB_ARCH_PACKAGES))::

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-04-10 18:13:19 UTC (rev 2966)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules.modules	2005-04-10 21:35:57 UTC (rev 2967)
@@ -6,6 +6,10 @@
 -include $(MA_DIR)/include/generic.make
 -include $(MA_DIR)/include/common-rules.make
 
+ifeq ($(DEB_HOST_ARCH), amd64)
+MAKEFLAGS := CC=gcc-3.4 V=1
+endif
+
 kdist_clean: prep-deb-files
 	dh_clean
 	$(MAKE) clean DIR=$(KSRC)
@@ -21,8 +25,8 @@
 	dh_installdirs lib/modules/$(KVERS)
 
 	# build and install the module
-	$(MAKE) DIR=$(KSRC) INSTALL_MOD_PATH=$(TARGET) KERNELRELEASE=$(KVERS)
-	$(MAKE) DIR=$(KSRC) INSTALL_MOD_PATH=$(TARGET) KERNELRELEASE=$(KVERS) install
+	$(MAKE) $(MAKEFLAGS) DIR=$(KSRC) INSTALL_MOD_PATH=$(TARGET) KERNELRELEASE=$(KVERS)
+	$(MAKE) $(MAKEFLAGS) DIR=$(KSRC) INSTALL_MOD_PATH=$(TARGET) KERNELRELEASE=$(KVERS) install
 
 	dh_installdocs
 	dh_installchangelogs