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

[Dann Frazier]

Author: dannf
Date: 2005-06-28 00:12:55 +0000 (Tue, 28 Jun 2005)
New Revision: 3406

Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch
Log:
add ia64 support


Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-06-26 21:25:33 UTC (rev 3405)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-06-28 00:12:55 UTC (rev 3406)
@@ -1,10 +1,11 @@
 kernel-source-nonfree-2.6.11 (2.6.11-2) UNRELEASED; urgency=low
 
-  * 001_ifndef-64bit.patch: do not build smctr module on amd64.
+  * 001_ifndef-64bit.patch: do not build smctr module on amd64 and ia64.
   * Add amd64-specific handling to rules files.
   * Release this package (closes: #306930) (Simon Horman)
+  * Add ia64 support (dann frazier)
 
- -- Simon Horman <horms@debian.org>  Sun,  1 May 2005 17:10:54 +1000
+ -- dann frazier <dannf@debian.org>  Mon, 27 Jun 2005 17:58:05 -0600
 
 kernel-source-nonfree-2.6.11 (2.6.11-1) unstable; urgency=low
 

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours	2005-06-26 21:25:33 UTC (rev 3405)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/flavours	2005-06-28 00:12:55 UTC (rev 3406)
@@ -1,5 +1,5 @@
 # This file contains the arches, subarches and flavours we are handling.
-archs: powerpc i386 amd64
+archs: powerpc i386 amd64 ia64
 
 # powerpc arch
 build-dep powerpc: flavour
@@ -20,3 +20,10 @@
 build-dep-name amd64: headers
 subarchs amd64: amd64
 flavours amd64: amd64-generic amd64-k8 amd64-k8-smp em64t-p4 em64t-p4-smp
+
+# ia64 arch
+abi ia64: 1
+build-dep ia64: flavour
+build-dep-name ia64: headers
+subarchs ia64: ia64
+flavours ia64: itanium itanium-smp mckinley mckinley-smp

Modified: 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-06-26 21:25:33 UTC (rev 3405)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/patches/001_ifndef-64bit.patch	2005-06-28 00:12:55 UTC (rev 3406)
@@ -3,7 +3,7 @@
 @@ -1,7 +1,10 @@
  DIR ?= /usr/src/linux
  
-+ifneq ($(DEB_HOST_ARCH), amd64)
++ifneq (,$(filter-out ia64 x86_64,$(DEB_BUILD_ARCH)))
  EXTRA_CFLAGS += -DCONFIG_SMCTR=1
  obj-m 	+= smctr.o
 +endif