debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=6511
This commit is contained in:
Bastian Blank 2006-04-30 19:01:34 +00:00
parent cebf983d6c
commit 4766560fa5
12 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/arch/amd64/xen-vserver/config vendored
View File

@ -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

2
debian/arch/amd64/xen-vserver/config.amd64-k8 vendored
View File

@ -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

1
debian/arch/amd64/xen/config vendored
View File

@ -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

2
debian/arch/amd64/xen/config.amd64-k8 vendored
View File

@ -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

2
debian/arch/amd64/xen/config.em64t-p4 vendored
View File

@ -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

1
debian/arch/i386/xen/config vendored
View File

@ -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

1
debian/arch/i386/xen/config.686 vendored
View File

@ -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

1
debian/arch/i386/xen/config.k7 vendored
View File

@ -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

3
debian/arch/i386/xen/defines vendored
View File

@ -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

2
debian/arch/s390/defines vendored
View File

@ -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.

7
debian/changelog vendored
View File

@ -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 <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

3
debian/rules.real vendored
View File

@ -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 '$@'