[kernel] r6511 - in dists/trunk/linux-2.6: . debian debian/arch/amd64/xen debian/arch/amd64/xen-vserver debian/arch/i386/xen debian/arch/s390

Sun Apr 30 19:01:37 UTC 2006

Author: waldi
Date: Sun Apr 30 19:01:34 2006
New Revision: 6511

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/xen/config
   dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/xen/config.em64t-p4
   dists/trunk/linux-2.6/debian/arch/i386/xen/config
   dists/trunk/linux-2.6/debian/arch/i386/xen/config.686
   dists/trunk/linux-2.6/debian/arch/i386/xen/config.k7
   dists/trunk/linux-2.6/debian/arch/i386/xen/defines
   dists/trunk/linux-2.6/debian/arch/s390/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config
==============================================================================

--- dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config	Sun Apr 30 19:01:34 2006
@@ -2,6 +2,7 @@
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8	Sun Apr 30 19:01:34 2006
@@ -20,6 +20,7 @@
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
@@ -32,3 +33,4 @@
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NUMA=y
 CONFIG_MIGRATION=y
+# CONFIG_HOTPLUG_CPU is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/config	Sun Apr 30 19:01:34 2006
@@ -2,6 +2,7 @@
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64-k8
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64-k8	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64-k8	Sun Apr 30 19:01:34 2006
@@ -20,6 +20,7 @@
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
@@ -32,3 +33,4 @@
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_ACPI_NUMA=y
 CONFIG_MIGRATION=y
+# CONFIG_HOTPLUG_CPU is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/xen/config.em64t-p4
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/config.em64t-p4	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen/config.em64t-p4	Sun Apr 30 19:01:34 2006
@@ -20,8 +20,10 @@
 CONFIG_SOUND_AWE32_SYNTH=m
 CONFIG_FS_MBCACHE=m
 CONFIG_ARCH_FLATMEM_ENABLE=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_DIGIEPCA=m
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 # CONFIG_X86_MCE_AMD is not set
+# CONFIG_HOTPLUG_CPU is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/config	Sun Apr 30 19:01:34 2006
@@ -3,6 +3,7 @@
 CONFIG_XEN_PCIDEV_FRONTEND=y
 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set
 CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
 # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/config.686	Sun Apr 30 19:01:34 2006
@@ -69,3 +69,4 @@
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+# CONFIG_HOTPLUG_CPU is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/config.k7
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/config.k7	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/config.k7	Sun Apr 30 19:01:34 2006
@@ -70,3 +70,4 @@
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_X86_CMPXCHG64=y
 # CONFIG_M486 is not set
+# CONFIG_HOTPLUG_CPU is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/xen/defines	Sun Apr 30 19:01:34 2006
@@ -4,15 +4,14 @@
  k7
 
 [image]
+recommends: libc6-i686
 type: plain-xen
 
 [686]
 class: PPro/Celeron/PII/PIII/P4
 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
-recommends: libc6-i686
 
 [k7]
 class: AMD K7
 longclass: 32bit AMD Duron/Athlon/AthlonXP
-recommends: libc6-i686
 

Modified: dists/trunk/linux-2.6/debian/arch/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/defines	Sun Apr 30 19:01:34 2006
@@ -5,6 +5,8 @@
  s390x
 kernel-arch: s390
 kernel-header-dirs: s390
+subarches:
+# vserver
 
 [image]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Apr 30 19:01:34 2006
@@ -14,9 +14,12 @@
 
   * Update vserver patch to 2.0.2-rc18.
     - Limit ccaps to root inside a guest
-  * Conflict with known broken grub versions. (closes: #361308) 
+  * Conflict with known broken grub versions. (closes: #361308)
+  * Enable s390 vserver image. 
+  * Enable xen and xen-vserver images.
+  * Use localversion for kernel-package images. (closes: #365505)
 
- -- Bastian Blank <waldi at debian.org>  Fri, 28 Apr 2006 22:52:13 +0200
+ -- Bastian Blank <waldi at debian.org>  Sun, 30 Apr 2006 19:50:52 +0200
 
 linux-2.6 (2.6.16-10) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sun Apr 30 19:01:34 2006
@@ -34,7 +34,7 @@
 # in Makefile.inc. @flavour@ in the expressions is going to be
 # replaced by the flavour for which the command is run. 
 #
-kpkg_image := make-kpkg --append-to-version '$(ABINAME)$(LOCALVERSION)'
+kpkg_image := make-kpkg
 kpkg_image += --arch '$(ARCH)'
 kpkg_image += --stem linux
 ifneq ($(INITRAMFS),False)
@@ -144,6 +144,7 @@
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$(CONFIG)' '$(DIR)/.config'
+	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
 	cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
 	touch '$@'
 

