[kernel] r6500 - in dists/trunk/linux-2.6/debian: . arch/i386
arch/powerpc patches/series
Frederik Schüler
fs at costa.debian.org
Sun Apr 30 14:43:29 UTC 2006
Author: fs
Date: Sun Apr 30 14:43:28 2006
New Revision: 6500
Modified:
dists/trunk/linux-2.6/debian/arch/i386/defines
dists/trunk/linux-2.6/debian/arch/powerpc/defines
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/series/99experimental.1-extra
Log:
Deactivate xen and vserver for all concerned architectures.
clean up -extra series file.
Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines Sun Apr 30 14:43:28 2006
@@ -8,9 +8,9 @@
kernel-arch: i386
kernel-header-dirs: i386
subarches:
- vserver
- xen
- xen-vserver
+# vserver
+# xen
+# xen-vserver
[image]
conflicts: grub (<= 0.95+cvs20040624-17)
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines Sun Apr 30 14:43:28 2006
@@ -8,7 +8,7 @@
kernel-arch: powerpc
kpkg-subarch: ppc
subarches:
- vserver
+# vserver
[apus]
depends: mkvmlinuz (>= 20)
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 14:43:28 2006
@@ -3,12 +3,14 @@
[ Frederik Schüler ]
* New upstream release.
* Switch HZ from 1000 to 250, following upstreams default.
+ * deactivate xen for amd64 and i386, vserver for amd64 i386 powerpc.
[ maximilian attems ]
* Disable broken and known unsecure LSM modules: CONFIG_SECURITY_SECLVL,
CONFIG_SECURITY_ROOTPLUG. Upstream plans to remove them for 2.6.18
- -- Frederik Schüler <fs at debian.org> Sun, 30 Apr 2006 15:54:15 +0200
+
+ -- Frederik Schüler <fs at debian.org> Sun, 30 Apr 2006 16:35:05 +0200
linux-2.6 (2.6.16-11) UNRELEASED; urgency=low
Modified: dists/trunk/linux-2.6/debian/patches/series/99experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/99experimental.1-extra (original)
+++ dists/trunk/linux-2.6/debian/patches/series/99experimental.1-extra Sun Apr 30 14:43:28 2006
@@ -1,26 +1,13 @@
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
+ maclist.patch arm armeb
-+ arm-nslu2-maclist.patch arm armeb
-+ vserver-version.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-xen-clash.patch *_xen-vserver
+#FIXME + arm-nslu2-maclist.patch arm armeb
+ mips-tulip.patch mipsel
+ mips-tulip_dc21143.patch mipsel
-+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc15-update.patch *_vserver
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
-+ arm-nslu2-maclist.patch arm armeb
-+ maclist.patch arm armeb
-+ mips-tulip.patch mipsel
-+ mips-tulip_dc21143.patch mipsel
-+ vserver-version.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
-+ vserver-vs2.0.2-rc15-update.patch *_vserver
-+ vserver-vs2.0.2-rc17-update.patch *_vserver
-+ vserver-vs2.0.2-rc18-update.patch *_vserver
-+ vserver-xen-clash.patch *_xen-vserver
-+ xen-tls.patch *_xen *_xen-vserver
-+ xen-tree-merge-22448.patch *_xen *_xen-vserver
+#+ xen-tree-merge-22448.patch *_xen *_xen-vserver
+#+ xen-tls.patch *_xen *_xen-vserver
+#+ vserver-version.patch *_vserver *_xen-vserver
+#+ vserver-xen-clash.patch *_xen-vserver
+#+ vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
+#+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver
+#+ vserver-vs2.0.2-rc15-update.patch *_vserver
+#+ vserver-vs2.0.2-rc17-update.patch *_vserver
+#+ vserver-vs2.0.2-rc18-update.patch *_vserver
More information about the Kernel-svn-changes
mailing list