Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=6511
This commit is contained in:
parent
cebf983d6c
commit
4766560fa5
|
@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y
|
||||||
CONFIG_XEN_PCIDEV_FRONTEND=y
|
CONFIG_XEN_PCIDEV_FRONTEND=y
|
||||||
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
||||||
CONFIG_XEN_PRIVILEGED_GUEST=y
|
CONFIG_XEN_PRIVILEGED_GUEST=y
|
||||||
|
CONFIG_XEN_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND=y
|
CONFIG_XEN_PCIDEV_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
||||||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||||
|
|
|
@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m
|
||||||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||||
CONFIG_FS_MBCACHE=m
|
CONFIG_FS_MBCACHE=m
|
||||||
CONFIG_NEED_MULTIPLE_NODES=y
|
CONFIG_NEED_MULTIPLE_NODES=y
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
CONFIG_HAVE_MEMORY_PRESENT=y
|
||||||
CONFIG_DIGIEPCA=m
|
CONFIG_DIGIEPCA=m
|
||||||
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
||||||
|
@ -32,3 +33,4 @@ CONFIG_X86_MCE_AMD=y
|
||||||
CONFIG_X86_64_ACPI_NUMA=y
|
CONFIG_X86_64_ACPI_NUMA=y
|
||||||
CONFIG_ACPI_NUMA=y
|
CONFIG_ACPI_NUMA=y
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
|
|
|
@ -2,6 +2,7 @@ CONFIG_X86_64_XEN=y
|
||||||
CONFIG_XEN_PCIDEV_FRONTEND=y
|
CONFIG_XEN_PCIDEV_FRONTEND=y
|
||||||
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
||||||
CONFIG_XEN_PRIVILEGED_GUEST=y
|
CONFIG_XEN_PRIVILEGED_GUEST=y
|
||||||
|
CONFIG_XEN_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND=y
|
CONFIG_XEN_PCIDEV_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
||||||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||||
|
|
|
@ -20,6 +20,7 @@ CONFIG_FB_MATROX_MAVEN=m
|
||||||
# CONFIG_SOUND_AWE32_SYNTH is not set
|
# CONFIG_SOUND_AWE32_SYNTH is not set
|
||||||
CONFIG_FS_MBCACHE=m
|
CONFIG_FS_MBCACHE=m
|
||||||
CONFIG_NEED_MULTIPLE_NODES=y
|
CONFIG_NEED_MULTIPLE_NODES=y
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
CONFIG_HAVE_MEMORY_PRESENT=y
|
CONFIG_HAVE_MEMORY_PRESENT=y
|
||||||
CONFIG_DIGIEPCA=m
|
CONFIG_DIGIEPCA=m
|
||||||
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
|
||||||
|
@ -32,3 +33,4 @@ CONFIG_X86_MCE_AMD=y
|
||||||
CONFIG_X86_64_ACPI_NUMA=y
|
CONFIG_X86_64_ACPI_NUMA=y
|
||||||
CONFIG_ACPI_NUMA=y
|
CONFIG_ACPI_NUMA=y
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
|
|
|
@ -20,8 +20,10 @@ CONFIG_R8169_VLAN=y
|
||||||
CONFIG_SOUND_AWE32_SYNTH=m
|
CONFIG_SOUND_AWE32_SYNTH=m
|
||||||
CONFIG_FS_MBCACHE=m
|
CONFIG_FS_MBCACHE=m
|
||||||
CONFIG_ARCH_FLATMEM_ENABLE=y
|
CONFIG_ARCH_FLATMEM_ENABLE=y
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
CONFIG_DIGIEPCA=m
|
CONFIG_DIGIEPCA=m
|
||||||
CONFIG_FLATMEM_MANUAL=y
|
CONFIG_FLATMEM_MANUAL=y
|
||||||
# CONFIG_SPARSEMEM_MANUAL is not set
|
# CONFIG_SPARSEMEM_MANUAL is not set
|
||||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||||
# CONFIG_X86_MCE_AMD is not set
|
# CONFIG_X86_MCE_AMD is not set
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
|
|
|
@ -3,6 +3,7 @@ CONFIG_X86_XEN=y
|
||||||
CONFIG_XEN_PCIDEV_FRONTEND=y
|
CONFIG_XEN_PCIDEV_FRONTEND=y
|
||||||
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
|
||||||
CONFIG_XEN_PRIVILEGED_GUEST=y
|
CONFIG_XEN_PRIVILEGED_GUEST=y
|
||||||
|
CONFIG_XEN_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND=y
|
CONFIG_XEN_PCIDEV_BACKEND=y
|
||||||
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
|
||||||
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
|
||||||
|
|
|
@ -69,3 +69,4 @@ CONFIG_X86_HT=y
|
||||||
CONFIG_X86_TRAMPOLINE=y
|
CONFIG_X86_TRAMPOLINE=y
|
||||||
CONFIG_X86_CMPXCHG64=y
|
CONFIG_X86_CMPXCHG64=y
|
||||||
# CONFIG_M486 is not set
|
# CONFIG_M486 is not set
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
|
|
|
@ -70,3 +70,4 @@ CONFIG_X86_HT=y
|
||||||
CONFIG_X86_TRAMPOLINE=y
|
CONFIG_X86_TRAMPOLINE=y
|
||||||
CONFIG_X86_CMPXCHG64=y
|
CONFIG_X86_CMPXCHG64=y
|
||||||
# CONFIG_M486 is not set
|
# CONFIG_M486 is not set
|
||||||
|
# CONFIG_HOTPLUG_CPU is not set
|
||||||
|
|
|
@ -4,15 +4,14 @@ flavours:
|
||||||
k7
|
k7
|
||||||
|
|
||||||
[image]
|
[image]
|
||||||
|
recommends: libc6-i686
|
||||||
type: plain-xen
|
type: plain-xen
|
||||||
|
|
||||||
[686]
|
[686]
|
||||||
class: PPro/Celeron/PII/PIII/P4
|
class: PPro/Celeron/PII/PIII/P4
|
||||||
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
|
||||||
recommends: libc6-i686
|
|
||||||
|
|
||||||
[k7]
|
[k7]
|
||||||
class: AMD K7
|
class: AMD K7
|
||||||
longclass: 32bit AMD Duron/Athlon/AthlonXP
|
longclass: 32bit AMD Duron/Athlon/AthlonXP
|
||||||
recommends: libc6-i686
|
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,8 @@ flavours:
|
||||||
s390x
|
s390x
|
||||||
kernel-arch: s390
|
kernel-arch: s390
|
||||||
kernel-header-dirs: s390
|
kernel-header-dirs: s390
|
||||||
|
subarches:
|
||||||
|
# vserver
|
||||||
|
|
||||||
[image]
|
[image]
|
||||||
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
|
desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
|
||||||
|
|
|
@ -14,9 +14,12 @@ linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
|
||||||
|
|
||||||
* Update vserver patch to 2.0.2-rc18.
|
* Update vserver patch to 2.0.2-rc18.
|
||||||
- Limit ccaps to root inside a guest
|
- 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@debian.org> Fri, 28 Apr 2006 22:52:13 +0200
|
-- Bastian Blank <waldi@debian.org> Sun, 30 Apr 2006 19:50:52 +0200
|
||||||
|
|
||||||
linux-2.6 (2.6.16-10) unstable; urgency=low
|
linux-2.6 (2.6.16-10) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ include debian/rules.defs
|
||||||
# in Makefile.inc. @flavour@ in the expressions is going to be
|
# in Makefile.inc. @flavour@ in the expressions is going to be
|
||||||
# replaced by the flavour for which the command is run.
|
# 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 += --arch '$(ARCH)'
|
||||||
kpkg_image += --stem linux
|
kpkg_image += --stem linux
|
||||||
ifneq ($(INITRAMFS),False)
|
ifneq ($(INITRAMFS),False)
|
||||||
|
@ -144,6 +144,7 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-kernel-package:
|
||||||
rm -rf '$(DIR)'
|
rm -rf '$(DIR)'
|
||||||
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
||||||
cp '$(CONFIG)' '$(DIR)/.config'
|
cp '$(CONFIG)' '$(DIR)/.config'
|
||||||
|
echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
|
||||||
cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
|
cd '$(DIR)'; $(setup_env) $(kpkg_image) configure
|
||||||
touch '$@'
|
touch '$@'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue