[kernel] r7031 - in dists/trunk/linux-2.6/debian: . templates

[Dann Frazier]

Author: dannf
Date: Mon Jul 17 05:16:08 2006
New Revision: 7031

Removed:
   dists/trunk/linux-2.6/debian/arch/ia64/config.itanium-smp
   dists/trunk/linux-2.6/debian/arch/ia64/config.mckinley-smp
Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.extra.in

Log:
* [ia64] Drop the non-SMP flavours; they are not well maintained upstream.
  Note that the non-SMP flavours have been identical to the SMP builds
  since 2.6.13-1; this was to avoid having to drop then re-add these
  flavours if upstream resolved the issue - but that never happened.
  Note that this is a measurable performance penalty on non-SMP systems.

Modified: dists/trunk/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/defines	Mon Jul 17 05:16:08 2006
@@ -2,9 +2,7 @@
 compiler: gcc-4.1
 flavours:
  itanium
- itanium-smp
  mckinley
- mckinley-smp
 kernel-arch: ia64
 kernel-header-dirs: ia64
 
@@ -14,12 +12,5 @@
 [itanium]
 class: Itanium
 
-[itanium-smp]
-class: multi-processor Itanium
-
 [mckinley]
 class: Itanium II
-
-[mckinley-smp]
-class: multi-processor Itanium II
-

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jul 17 05:16:08 2006
@@ -1,11 +1,19 @@
 linux-2.6 (2.6.17-4) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Add stable release 2.6.17.5:
     - Fix nasty /proc vulnerability (CVE-2006-3626)
   * Add stable release 2.6.17.6:
     - Relax /proc fix a bit
 
- -- Bastian Blank <waldi at debian.org>  Sat, 15 Jul 2006 21:46:05 +0200
+  [ dann frazier ]
+  * [ia64] Drop the non-SMP flavours; they are not well maintained upstream.
+    Note that the non-SMP flavours have been identical to the SMP builds
+    since 2.6.13-1; this was to avoid having to drop then re-add these
+    flavours if upstream resolved the issue - but that never happened.
+    Note that this is a measurable performance penalty on non-SMP systems.
+
+ -- dann frazier <dannf at debian.org>  Sun, 16 Jul 2006 23:07:54 -0600
 
 linux-2.6 (2.6.17-3) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.extra.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.extra.in	Mon Jul 17 05:16:08 2006
@@ -121,6 +121,22 @@
 Description: Linux kernel 2.6 image on multi-processor Itanium II machines - transition package
  This package is for transition only.
 
+Package: linux-image-2.6-itanium-smp
+Architecture: ia64
+Section: base
+Priority: extra
+Depends: linux-image-2.6-itanium
+Description: Linux kernel 2.6 image on Itanium machines - transition package
+ This package is for transition only.
+
+Package: linux-image-2.6-mckinley-smp
+Architecture: ia64
+Section: base
+Priority: extra
+Depends: linux-image-2.6-mckinley
+Description: Linux kernel 2.6 image on Itanium II machines - transition package
+ This package is for transition only.
+
 Package: kernel-image-powerpc
 X-Version-Overwrite-Epoch: 1
 Architecture: powerpc