[kernel] r6495 - in dists/sid/linux-2.6/debian/arch: amd64 amd64/xen amd64/xen-vserver i386 i386/xen i386/xen-vserver

Bastian Blank waldi at costa.debian.org
Sat Apr 29 20:27:57 UTC 2006 

Author: waldi
Date: Sat Apr 29 20:27:54 2006
New Revision: 6495

Added:
   dists/sid/linux-2.6/debian/arch/i386/xen-vserver/
      - copied from r6402, dists/sid/linux-2.6-exp/debian/arch/i386/xen-vserver/
Modified:
   dists/sid/linux-2.6/debian/arch/amd64/defines
   dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config
   dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8
   dists/sid/linux-2.6/debian/arch/amd64/xen/config
   dists/sid/linux-2.6/debian/arch/amd64/xen/config.amd64-k8
   dists/sid/linux-2.6/debian/arch/amd64/xen/config.em64t-p4
   dists/sid/linux-2.6/debian/arch/i386/defines
   dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines
   dists/sid/linux-2.6/debian/arch/i386/xen/config
   dists/sid/linux-2.6/debian/arch/i386/xen/config.686
   dists/sid/linux-2.6/debian/arch/i386/xen/config.k7
   dists/sid/linux-2.6/debian/arch/i386/xen/defines
Log:
* debian/arch/amd64/defines, debian/arch/i386/defines:
  Enable xen and xen-vserver subarch.
* debian/arch/i386/xen/defines: Cleanup.
* debian/arch/amd64/xen/config,
  debian/arch/amd64/xen/config.amd64-k8,
  debian/arch/amd64/xen/config.em64t-p4,
  debian/arch/amd64/xen-vserver/config,
  debian/arch/amd64/xen-vserver/config.amd64-k8,
  debian/arch/i386/xen/config,
  debian/arch/i386/xen/config.686,
  debian/arch/i386/xen/config.k7: Update.
* debian/arch/i386/xen-vserver: Add.


Modified: dists/sid/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/defines	Sat Apr 29 20:27:54 2006
@@ -9,6 +9,8 @@
 kernel-header-dirs: x86_64 i386
 subarches:
  vserver
+ xen
+ xen-vserver
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)

Modified: dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config	Sat Apr 29 20:27:54 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
@@ -18,6 +19,7 @@
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y
 CONFIG_VSERVER=y
 CONFIG_VSERVER_SECURITY=y
 CONFIG_VSERVER_LEGACYNET=y

Modified: dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8	Sat Apr 29 20:27:54 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/sid/linux-2.6/debian/arch/amd64/xen/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen/config	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen/config	Sat Apr 29 20:27:54 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
@@ -18,3 +19,4 @@
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y

Modified: dists/sid/linux-2.6/debian/arch/amd64/xen/config.amd64-k8
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen/config.amd64-k8	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen/config.amd64-k8	Sat Apr 29 20:27:54 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/sid/linux-2.6/debian/arch/amd64/xen/config.em64t-p4
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/xen/config.em64t-p4	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/xen/config.em64t-p4	Sat Apr 29 20:27:54 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/sid/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/defines	Sat Apr 29 20:27:54 2006
@@ -9,6 +9,8 @@
 kernel-header-dirs: i386
 subarches:
  vserver
+ xen
+ xen-vserver
 
 [image]
 conflicts: grub (<= 0.95+cvs20040624-17)

Modified: dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines
==============================================================================
--- dists/sid/linux-2.6-exp/debian/arch/i386/xen-vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen-vserver/defines	Sat Apr 29 20:27:54 2006
@@ -3,10 +3,10 @@
  686
 
 [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
 

Modified: dists/sid/linux-2.6/debian/arch/i386/xen/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/config	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/config	Sat Apr 29 20:27:54 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
@@ -19,5 +20,6 @@
 # CONFIG_XEN_TPMDEV_FRONTEND is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_XEN_SYSFS=y
 # CONFIG_SMP_ALTERNATIVES is not set
 # CONFIG_PCI_GOXEN_FE is not set

Modified: dists/sid/linux-2.6/debian/arch/i386/xen/config.686
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/config.686	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/config.686	Sat Apr 29 20:27:54 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/sid/linux-2.6/debian/arch/i386/xen/config.k7
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/config.k7	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/config.k7	Sat Apr 29 20:27:54 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/sid/linux-2.6/debian/arch/i386/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/xen/defines	Sat Apr 29 20:27:54 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

More information about the Kernel-svn-changes mailing list