r3681 - in people/waldi/kernel/source/linux-2.6/debian: . arch/ia64

[Bastian Blank]

Author: waldi
Date: 2005-08-03 22:35:41 +0000 (Wed, 03 Aug 2005)
New Revision: 3681

Added:
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium-smp
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley
   people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley-smp
Modified:
   people/waldi/kernel/source/linux-2.6/debian/
   people/waldi/kernel/source/linux-2.6/debian/Makefile
   people/waldi/kernel/source/linux-2.6/debian/changelog
Log:
Merge /trunk/kernel/source/linux-2.6.



Property changes on: people/waldi/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3676

Modified: people/waldi/kernel/source/linux-2.6/debian/Makefile
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/Makefile	2005-08-03 22:35:41 UTC (rev 3681)
@@ -15,11 +15,17 @@
 #
 # These variables control the behaviour of make-kpkg
 #
+# enable cross-compiling for m68k
+#DEB_HOST_ARCH := m68k
+#
 DEBIAN_UPSTREAM_VERSION := $(version)
 ifeq (,$(DEB_HOST_ARCH))
   DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
   DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 endif
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+  cross_compile := $(DEB_HOST_ARCH)
+endif
 export version debnum DEBIAN_UPSTREAM_VERSION DEBIAN_STEM
 
 karch := $(DEB_HOST_ARCH)
@@ -61,6 +67,10 @@
 ifdef build_subarch
   kpkg_build_cmd += --subarch $(build_subarch)
 endif
+ifeq ($(cross_compile),m68k)
+  kpkg_headers_cmd +=  --arch m68k --cross_compile m68k-linux
+  kpkg_build_cmd +=  --arch m68k --cross_compile m68k-linux
+endif
 ifdef headers_subarch
   kpkg_headers_cmd += --subarch $(headers_subarch)
 endif

Added: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium	2005-08-03 22:35:41 UTC (rev 3681)
@@ -0,0 +1 @@
+class="Itanium"

Added: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium-smp	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.itanium-smp	2005-08-03 22:35:41 UTC (rev 3681)
@@ -0,0 +1 @@
+class="multi-processor Itanium"

Added: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley	2005-08-03 22:35:41 UTC (rev 3681)
@@ -0,0 +1 @@
+class="Itanium II"

Added: people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley-smp	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/ia64/desc.mckinley-smp	2005-08-03 22:35:41 UTC (rev 3681)
@@ -0,0 +1 @@
+class="multi-processor Itanium II"

Modified: people/waldi/kernel/source/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-03 18:12:37 UTC (rev 3680)
+++ people/waldi/kernel/source/linux-2.6/debian/changelog	2005-08-03 22:35:41 UTC (rev 3681)
@@ -17,7 +17,10 @@
   [ Vincent Sanders ]
   * Add ARM configs
 
- -- Vincent Sanders <vince at debian.org>  Sun, 31 Jul 2005 15:55:23 +0100
+  [ dann frazier ]
+  * Add desc.* files for ia64
+
+ -- dann frazier <dannf at debian.org>  Mon, 01 Aug 2005 11:41:35 -0600
  
 linux-2.6 (2.6.12-1) unstable; urgency=low