From 4766560fa586054c8c8a63faf38d453ec4322c7d Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 30 Apr 2006 19:01:34 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6511 --- debian/arch/amd64/xen-vserver/config | 1 + debian/arch/amd64/xen-vserver/config.amd64-k8 | 2 ++ debian/arch/amd64/xen/config | 1 + debian/arch/amd64/xen/config.amd64-k8 | 2 ++ debian/arch/amd64/xen/config.em64t-p4 | 2 ++ debian/arch/i386/xen/config | 1 + debian/arch/i386/xen/config.686 | 1 + debian/arch/i386/xen/config.k7 | 1 + debian/arch/i386/xen/defines | 3 +-- debian/arch/s390/defines | 2 ++ debian/changelog | 7 +++++-- debian/rules.real | 3 ++- 12 files changed, 21 insertions(+), 5 deletions(-) diff --git a/debian/arch/amd64/xen-vserver/config b/debian/arch/amd64/xen-vserver/config index a7a61b5c3..0bdd87715 100644 --- a/debian/arch/amd64/xen-vserver/config +++ b/debian/arch/amd64/xen-vserver/config @@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y 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 diff --git a/debian/arch/amd64/xen-vserver/config.amd64-k8 b/debian/arch/amd64/xen-vserver/config.amd64-k8 index 65f6ccc63..b47efa5ab 100644 --- a/debian/arch/amd64/xen-vserver/config.amd64-k8 +++ b/debian/arch/amd64/xen-vserver/config.amd64-k8 @@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m # 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_MCE_AMD=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_ACPI_NUMA=y CONFIG_MIGRATION=y +# CONFIG_HOTPLUG_CPU is not set diff --git a/debian/arch/amd64/xen/config b/debian/arch/amd64/xen/config index 30bbec045..903603ae2 100644 --- a/debian/arch/amd64/xen/config +++ b/debian/arch/amd64/xen/config @@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y 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 diff --git a/debian/arch/amd64/xen/config.amd64-k8 b/debian/arch/amd64/xen/config.amd64-k8 index 65f6ccc63..b47efa5ab 100644 --- a/debian/arch/amd64/xen/config.amd64-k8 +++ b/debian/arch/amd64/xen/config.amd64-k8 @@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m # 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_MCE_AMD=y CONFIG_X86_64_ACPI_NUMA=y CONFIG_ACPI_NUMA=y CONFIG_MIGRATION=y +# CONFIG_HOTPLUG_CPU is not set diff --git a/debian/arch/amd64/xen/config.em64t-p4 b/debian/arch/amd64/xen/config.em64t-p4 index b4e2aad99..6ec580dd7 100644 --- a/debian/arch/amd64/xen/config.em64t-p4 +++ b/debian/arch/amd64/xen/config.em64t-p4 @@ -20,8 +20,10 @@ CONFIG_R8169_VLAN=y 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 diff --git a/debian/arch/i386/xen/config b/debian/arch/i386/xen/config index d78ec562f..38a31be99 100644 --- a/debian/arch/i386/xen/config +++ b/debian/arch/i386/xen/config @@ -3,6 +3,7 @@ CONFIG_X86_XEN=y 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 diff --git a/debian/arch/i386/xen/config.686 b/debian/arch/i386/xen/config.686 index a24aa9bb1..cff5c5c5d 100644 --- a/debian/arch/i386/xen/config.686 +++ b/debian/arch/i386/xen/config.686 @@ -69,3 +69,4 @@ CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_X86_CMPXCHG64=y # CONFIG_M486 is not set +# CONFIG_HOTPLUG_CPU is not set diff --git a/debian/arch/i386/xen/config.k7 b/debian/arch/i386/xen/config.k7 index 076ab5f41..aea440816 100644 --- a/debian/arch/i386/xen/config.k7 +++ b/debian/arch/i386/xen/config.k7 @@ -70,3 +70,4 @@ CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_X86_CMPXCHG64=y # CONFIG_M486 is not set +# CONFIG_HOTPLUG_CPU is not set diff --git a/debian/arch/i386/xen/defines b/debian/arch/i386/xen/defines index 22d504e0a..f350eb952 100644 --- a/debian/arch/i386/xen/defines +++ b/debian/arch/i386/xen/defines @@ -4,15 +4,14 @@ flavours: 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 diff --git a/debian/arch/s390/defines b/debian/arch/s390/defines index 160c97393..a0a75edd8 100644 --- a/debian/arch/s390/defines +++ b/debian/arch/s390/defines @@ -5,6 +5,8 @@ flavours: 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. diff --git a/debian/changelog b/debian/changelog index 0c8d5a8e6..83295b5dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,9 +14,12 @@ linux-2.6 (2.6.16-11) UNRELEASED; urgency=low * 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 Fri, 28 Apr 2006 22:52:13 +0200 + -- Bastian Blank Sun, 30 Apr 2006 19:50:52 +0200 linux-2.6 (2.6.16-10) unstable; urgency=low diff --git a/debian/rules.real b/debian/rules.real index dea6fd0b3..be3b834d6 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -34,7 +34,7 @@ include debian/rules.defs # 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 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package: 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 '$@'