r3249 - in trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8: config debian
Dann Frazier
dannf@costa.debian.org
Fri, 27 May 2005 23:12:03 +0000
Author: dannf
Date: 2005-05-27 23:12:02 +0000 (Fri, 27 May 2005)
New Revision: 3249
Modified:
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog
trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control
Log:
* Try to get a new build into sarge, which means reverting ABI changes
that would otherwise break d-i.
* Rebuild against kernel-tree-2.6.8-16, which includes security fixes and
reverts the ABI changing patches in kernel-tree-2.6.8-14 (they were
actually reverted in kernel-tree-2.6.8-15)
* Re-enable CONFIG_PREEMPT to revert the ABI change. I'll try to push this
change in through security.debian.org later.
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/default 2005-05-27 23:12:02 UTC (rev 3249)
@@ -75,7 +75,8 @@
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_HAVE_DEC_LOCK=y
CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium 2005-05-27 23:12:02 UTC (rev 3249)
@@ -75,7 +75,8 @@
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_HAVE_DEC_LOCK=y
CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/itanium-smp 2005-05-27 23:12:02 UTC (rev 3249)
@@ -75,7 +75,8 @@
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_HAVE_DEC_LOCK=y
CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley 2005-05-27 23:12:02 UTC (rev 3249)
@@ -75,7 +75,8 @@
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_HAVE_DEC_LOCK=y
CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/config/mckinley-smp 2005-05-27 23:12:02 UTC (rev 3249)
@@ -75,7 +75,8 @@
CONFIG_IOSAPIC=y
CONFIG_FORCE_MAX_ZONEORDER=18
# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
+CONFIG_HAVE_DEC_LOCK=y
CONFIG_IA32_SUPPORT=y
CONFIG_COMPAT=y
CONFIG_PERFMON=y
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/changelog 2005-05-27 23:12:02 UTC (rev 3249)
@@ -1,12 +1,14 @@
kernel-image-2.6.8-ia64 (2.6.8-14) UNRELEASED; urgency=low
- * Rebuild against kernel-tree-2.6.8-15
- *** k-t-2.6.8-14 changed the ABI, 2.6.8-15 changes it back ***
- *** the ABI should roll if we rebuild against -15, but it ***
- *** it might not need to if we wait for -16 and it happens **
- *** to just use the -14 ABI ***
+ * Try to get a new build into sarge, which means reverting ABI changes
+ that would otherwise break d-i.
+ * Rebuild against kernel-tree-2.6.8-16, which includes security fixes and
+ reverts the ABI changing patches in kernel-tree-2.6.8-14 (they were
+ actually reverted in kernel-tree-2.6.8-15)
+ * Re-enable CONFIG_PREEMPT to revert the ABI change. I'll try to push this
+ change in through security.debian.org later.
- -- dann frazier <dannf@biglpk.hpde> Sat, 26 Mar 2005 09:26:26 -0700
+ -- dann frazier <dannf@debian.org> Fri, 27 May 2005 17:02:42 -0600
kernel-image-2.6.8-ia64 (2.6.8-13) unstable; urgency=low
Modified: trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control 2005-05-27 18:34:16 UTC (rev 3248)
+++ trunk/kernel/ia64/kernel-image-2.6.8-ia64-2.6.8/debian/control 2005-05-27 23:12:02 UTC (rev 3249)
@@ -2,11 +2,11 @@
Section: devel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: dann frazier <dannf@hp.com>
+Uploaders: dann frazier <dannf@debian.org>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-15, module-init-tools
+Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.8-16, module-init-tools
-Package: kernel-headers-2.6.8-3
+Package: kernel-headers-2.6.8-2
Architecture: ia64
Section: devel
Priority: optional
@@ -15,31 +15,31 @@
Description: Header files related to Linux kernel version 2.6.8
This package provides kernel header files for version 2.6.8, for sites
that want the latest kernel headers. Please read
- /usr/share/doc/kernel-headers-2.6.8-3/debian.README.gz for details.
+ /usr/share/doc/kernel-headers-2.6.8-2/debian.README.gz for details.
-Package: kernel-headers-2.6.8-3-itanium
+Package: kernel-headers-2.6.8-2-itanium
Architecture: ia64
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers 2.6.8 on Itanium
This package provides kernel header files for version 2.6.8 on
Itanium,
for sites that want the latest kernel headers.
- Please read /usr/share/doc/kernel-headers-2.6.8-3-itanium/debian.README.gz for
+ Please read /usr/share/doc/kernel-headers-2.6.8-2-itanium/debian.README.gz for
details.
Package: kernel-headers-2.6-itanium
Architecture: ia64
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.8-3-itanium
+Depends: kernel-headers-2.6.8-2-itanium
Description: Linux kernel headers 2.6 on Itanium
This package will always depend on the latest 2.6 kernel headers available
for Itanium.
-Package: kernel-image-2.6.8-3-itanium
+Package: kernel-image-2.6.8-2-itanium
Architecture: ia64
Section: base
Priority: optional
@@ -62,16 +62,16 @@
Architecture: ia64
Section: base
Priority: optional
-Depends: kernel-image-2.6.8-3-itanium
+Depends: kernel-image-2.6.8-2-itanium
Description: Linux kernel image for version 2.6 on Itanium
This package will always depend on the latest 2.6 kernel image available
for Itanium.
-Package: kernel-headers-2.6.8-3-itanium-smp
+Package: kernel-headers-2.6.8-2-itanium-smp
Architecture: ia64
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers 2.6.8 on Itanium SMP
This package provides kernel header files for version 2.6.8 on
@@ -79,20 +79,20 @@
for sites that want the latest kernel headers.
SMP (symmetric multi-processing) is needed if you have multiple processors.
Please read
- /usr/share/doc/kernel-headers-2.6.8-3-itanium-smp/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-2-itanium-smp/debian.README.gz for
details.
Package: kernel-headers-2.6-itanium-smp
Architecture: ia64
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.8-3-itanium-smp
+Depends: kernel-headers-2.6.8-2-itanium-smp
Description: Linux kernel headers 2.6 on Itanium SMP
This package will always depend on the latest 2.6 kernel headers available
for Itanium with SMP support.
SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-image-2.6.8-3-itanium-smp
+Package: kernel-image-2.6.8-2-itanium-smp
Architecture: ia64
Section: base
Priority: optional
@@ -116,36 +116,36 @@
Architecture: ia64
Section: base
Priority: optional
-Depends: kernel-image-2.6.8-3-itanium-smp
+Depends: kernel-image-2.6.8-2-itanium-smp
Description: Linux kernel image for version 2.6 on Itanium SMP
This package will always depend on the latest 2.6 kernel image available
for Itanium with SMP support.
SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-headers-2.6.8-3-mckinley
+Package: kernel-headers-2.6.8-2-mckinley
Architecture: ia64
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers 2.6.8 on Itanium II
This package provides kernel header files for version 2.6.8 on
Itanium II (also known as McKinley),
for sites that want the latest kernel headers.
Please read
- /usr/share/doc/kernel-headers-2.6.8-3-mckinley/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-2-mckinley/debian.README.gz for
details.
Package: kernel-headers-2.6-mckinley
Architecture: ia64
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.8-3-mckinley
+Depends: kernel-headers-2.6.8-2-mckinley
Description: Linux kernel headers 2.6 on Itanium II
This package will always depend on the latest 2.6 kernel headers available
for Itanium II (also known as McKinley).
-Package: kernel-image-2.6.8-3-mckinley
+Package: kernel-image-2.6.8-2-mckinley
Architecture: ia64
Section: base
Priority: optional
@@ -168,16 +168,16 @@
Architecture: ia64
Section: base
Priority: optional
-Depends: kernel-image-2.6.8-3-mckinley
+Depends: kernel-image-2.6.8-2-mckinley
Description: Linux kernel image for version 2.6 on Itanium II
This package will always depend on the latest 2.6 kernel image available
for Itanium II (also known as McKinley).
-Package: kernel-headers-2.6.8-3-mckinley-smp
+Package: kernel-headers-2.6.8-2-mckinley-smp
Architecture: ia64
Section: devel
Priority: optional
-Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-3
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.8-2
Provides: kernel-headers, kernel-headers-2.6
Description: Linux kernel headers 2.6.8 on Itanium II SMP
This package provides kernel header files for version 2.6.8 on
@@ -185,20 +185,20 @@
for sites that want the latest kernel headers.
SMP (symmetric multi-processing) is needed if you have multiple processors.
Please read
- /usr/share/doc/kernel-headers-2.6.8-3-mckinley-smp/debian.README.gz for
+ /usr/share/doc/kernel-headers-2.6.8-2-mckinley-smp/debian.README.gz for
details.
Package: kernel-headers-2.6-mckinley-smp
Architecture: ia64
Section: devel
Priority: optional
-Depends: kernel-headers-2.6.8-3-mckinley-smp
+Depends: kernel-headers-2.6.8-2-mckinley-smp
Description: Linux kernel headers 2.6 on Itanium II SMP
This package will always depend on the latest 2.6 kernel headers available
for Itanium II (also known as McKinley) with SMP support.
SMP (symmetric multi-processing) is needed if you have multiple processors.
-Package: kernel-image-2.6.8-3-mckinley-smp
+Package: kernel-image-2.6.8-2-mckinley-smp
Architecture: ia64
Section: base
Priority: optional
@@ -222,7 +222,7 @@
Architecture: ia64
Section: base
Priority: optional
-Depends: kernel-image-2.6.8-3-mckinley-smp
+Depends: kernel-image-2.6.8-2-mckinley-smp
Description: Linux kernel image for version 2.6 on Itanium II SMP
This package will always depend on the latest 2.6 kernel image available
for Itanium II (also known as McKinley) with SMP support.