summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-04-02 09:43:42 +0000
committerPeter Volkov <pva@gentoo.org>2008-04-02 09:43:42 +0000
commit0bd4cca9b7f796f53f3e8fff74cd595d871bfa38 (patch)
tree1aed67c2c28a20bbcd4f7e0db262ea77cf571988 /sys-kernel
parentAdd a patch to disable tcp listening in nxagent (diff)
downloadhistorical-0bd4cca9b7f796f53f3e8fff74cd595d871bfa38.tar.gz
historical-0bd4cca9b7f796f53f3e8fff74cd595d871bfa38.tar.bz2
historical-0bd4cca9b7f796f53f3e8fff74cd595d871bfa38.zip
New development snapshot from upstream. Removed old.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/openvz-sources/ChangeLog16
-rw-r--r--sys-kernel/openvz-sources/Manifest22
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch24
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch27
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch31
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch38
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch23
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch29
-rw-r--r--sys-kernel/openvz-sources/openvz-sources-2.6.24.004.1.ebuild (renamed from sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild)8
9 files changed, 19 insertions, 199 deletions
diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 6f75da3e0388..ce64e2a460fd 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,20 @@
# ChangeLog for sys-kernel/openvz-sources
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.88 2008/03/14 20:02:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.89 2008/04/02 09:43:41 pva Exp $
+
+*openvz-sources-2.6.24.004.1 (02 Apr 2008)
+
+ 02 Apr 2008; Peter Volkov <pva@gentoo.org>
+ -files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch,
+ -files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch
+ ,
+ -files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns
+ .patch, -files/openvz-sources-2.6.24.002.2-proc-compilation.patch,
+ -files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch,
+ -files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch,
+ -openvz-sources-2.6.24.002.2-r1.ebuild,
+ +openvz-sources-2.6.24.004.1.ebuild:
+ New development snapshot from upstream. Removed old.
14 Mar 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
fix metadata
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index ea5477011dac..c1210cc69944 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,25 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX openvz-sources-2.6.18-ms-splice-access.patch 712 RMD160 9c9125f4500fefcbd14e36a8ee5f5028bab9f467 SHA1 7c5d45417380edd8e3c3b4f64722791ab0132f19 SHA256 46f19b681afb0d0b101eb92695108e7b60b0b191cbc77bbf56446116e591d7ad
-AUX openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch 854 RMD160 587bc60a16a76ab9581c0bd3fd0e74696584aed6 SHA1 f977fcb11bc97bfa3f5fd543862351d031cd0d3e SHA256 0d052aad9241007172ed813bf43fcfbb63a5e4cd98acdb278eef7161177cf042
-AUX openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch 950 RMD160 3f2f43fc5bc88b22dcd93bc6adc70e938666d80f SHA1 345de53d8f7c8881132e501e1b269faf759379a3 SHA256 5613d78c15bd116f901a22dc07adeab67479b02ab9a4b69ab9527fbb0f073ed9
-AUX openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch 1128 RMD160 2b0a4d5e4141665d456c1bd77e4345c84a9a8bd5 SHA1 4b1c06a47d9d9061223f884da1ca1e537490376b SHA256 272bb6255416c0e8e5fcf85d5aeebbc84fa5d49225e0caaee1172090d6a29075
-AUX openvz-sources-2.6.24.002.2-proc-compilation.patch 1281 RMD160 9edde19823d960087c0c13105b13b374327b7658 SHA1 9e21df24dd99b5a5bcb4f85fd9da07e79e0882e6 SHA256 517d13fc3a679eec0af13a927c509f78edcfc954beb4b7d36b1104c6465765d9
-AUX openvz-sources-2.6.24.002.2-reexport-sys_open.patch 796 RMD160 8bc8c9a2f14953145376a7db18d6aa61d2f57b3f SHA1 7c2bbe8321c7412e91a8eb040d0b0688197f290e SHA256 cee31f30298af2d2c02918a43675cb2dce2c1ec3ef05fac4454b54d2602c93d4
-AUX openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch 1107 RMD160 9aeedf95e463475de46085a9004a841d1fa906a4 SHA1 9e826fa25b05daf06ba41bc793af4884dd880f4b SHA256 3533eb7b8569137d6de0b0e95a9917de565ff5ae731d39c0bb266b0859982387
DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
DIST linux-2.6.24.tar.bz2 46737783 RMD160 0e5194c69c3d82c41ece689c4f84e638f8776d34 SHA1 351aebc784a5395fe4c92d1e514a89680482f7e2 SHA256 413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
-DIST patch-ovz002.2-combined.gz 767800 RMD160 8d0ddce088e07ed02a8005c290e32d6589d76cc6 SHA1 cce4ee89ca9395bc0a67e62d21ea6d8d9448acf9 SHA256 2868a9d5b32e1e4a8e657ecebe4dc8ddd7a0275463b386c2776023beaa4e5c38
+DIST patch-ovz004.1-combined.gz 773228 RMD160 db11a51448dfc50265bdefe2c1216647856aab38 SHA1 40777b27e7da931f2fb8f61456e3fb3608464813 SHA256 e65de9ac1bef2476ccaa9974e5cde2896e90ee9e181936aecb7644a5a18bcc1d
DIST patch-ovz028stab053.4-combined.gz 1142095 RMD160 d4ac3f1d6c6db92bae89859c96e94df24a9e37ca SHA1 7e0a8c3caf808cec70d8676770cc32859ef4f4df SHA256 3d7901582c35b70c9581e2cd1d3e1a3ddae79b607c7de927cd99edc878e73f27
EBUILD openvz-sources-2.6.18.028.053-r2.ebuild 1308 RMD160 faa90fe50a134a7f18e74744fb786b05fe2b2830 SHA1 2a0c0a3c05bef299999992403ab4608b832a4b06 SHA256 3a588a2b6fad71661d97c6628b0d8dcdb1c73acda7739cac7f9821dfce00351c
-EBUILD openvz-sources-2.6.24.002.2-r1.ebuild 1715 RMD160 55aa52b4ccc2843174c0833780cb9895af152fbf SHA1 d8c7c02fc14ae07f6ca1bc818a93c22b0f596df4 SHA256 510fe81c5525837f7f721f2a8a931df4e1b9544ec29d8a5f760286ac53fb8063
-MISC ChangeLog 20142 RMD160 2203fdd4833b29e289563ed79c2b9084debbb3a2 SHA1 55b967e56cc6134a2c42278408ca1aba8cb502eb SHA256 db63ceeffb09e9144c56e6f9e0507bf1376d88a42bb295ba812c4e2b8eb4338a
+EBUILD openvz-sources-2.6.24.004.1.ebuild 1282 RMD160 aa6bdb7a55dc33de1868d9d01d90bb3f1e5768df SHA1 a9b285a713b2fda38e4a9932d31e390902b63a72 SHA256 f4813d186b93a2d327daf8a72956fe637d15ea362b13a721f6a502762dab741d
+MISC ChangeLog 20787 RMD160 8a1a803b7f5e6426b1af910a2cd57371c15da081 SHA1 ce2eb9e3aeb9e7ee778883cb53fed1a93741064d SHA256 612a8603a77c6cb98c5cb768059cb9bfed668b0bc8b3bf47c9fef17bb9794391
MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH2tnRmPFBzbX68WERAk6XAJ49+7ODF9uXD2fkDLAe0qdWHicHlQCfSVsX
-kY8RzJ/uAvrUrxHHo2bMnI0=
-=pryC
------END PGP SIGNATURE-----
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch
deleted file mode 100644
index 0f3d3c5a563f..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Alexey Dobriyan <adobriyan@openvz.org>
-Date: Tue, 4 Mar 2008 12:33:53 +0000 (+0300)
-Subject: CPT: select PM as well
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=15938557b7ee1cebc893c676e0574a990fb79947;hp=1cfe443dac8890ab8e6e3eb8824b1aebb126f697
-
-CPT: select PM as well
-
-Just PM_SLEEP is not enough, because selecting logic doesn't select second and
-all other levels of dependencies (which is probably a bug in build system
-depending on how to look at it).
----
-
-diff --git a/kernel/Kconfig.openvz b/kernel/Kconfig.openvz
-index 5cdcdd3..5d5d6f0 100644
---- a/kernel/Kconfig.openvz
-+++ b/kernel/Kconfig.openvz
-@@ -70,6 +70,7 @@ config VZ_WDOG
- config VZ_CHECKPOINT
- tristate "Checkpointing & restoring Virtual Environments"
- depends on VE_CALLS && INET
-+ select PM
- select PM_SLEEP
- select TUN
- select VE_ETHDEV
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch
deleted file mode 100644
index cc6b40bff491..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Alexey Dobriyan <adobriyan@openvz.org>
-Date: Mon, 3 Mar 2008 10:46:34 +0000 (+0300)
-Subject: CPT: select tun, venet, veth modules
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=b1a7063c226542f1f62972173056fa0971f9d9e8;hp=da23c1831f33ce142b38534f8e54f985f651707c
-
-CPT: select tun, venet, veth modules
-
-CONFIG_VZ_CHEKPOINT=y, CONFIG_TUN=m result in linking breakage
-because CPT can't find tun_chr_open() et al.
-
-So, if you build CPT as standalone, tun/tap will be also standalone.
----
-
-diff --git a/kernel/Kconfig.openvz b/kernel/Kconfig.openvz
-index 7371679..5cdcdd3 100644
---- a/kernel/Kconfig.openvz
-+++ b/kernel/Kconfig.openvz
-@@ -71,6 +71,9 @@ config VZ_CHECKPOINT
- tristate "Checkpointing & restoring Virtual Environments"
- depends on VE_CALLS && INET
- select PM_SLEEP
-+ select TUN
-+ select VE_ETHDEV
-+ select VE_NETDEV
- default m
- help
- This option adds two modules, "cpt" and "rst", which allow
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch
deleted file mode 100644
index e73502c20d09..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Alexey Dobriyan <adobriyan@openvz.org>
-Date: Tue, 4 Mar 2008 10:48:08 +0000 (+0300)
-Subject: SIT: create sit devices in correct netns
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=1cfe443dac8890ab8e6e3eb8824b1aebb126f697;hp=29ec264a595bb385ce4818a31a01987b3b31fd9c
-
-SIT: create sit devices in correct netns
-
-http://bugzilla.openvz.org/show_bug.cgi?id=825
----
-
-diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index 208b16e..f45f3ad 100644
---- a/net/ipv6/sit.c
-+++ b/net/ipv6/sit.c
-@@ -201,7 +201,7 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int
- dev = alloc_netdev(sizeof(*t), name, ipip6_tunnel_setup);
- if (dev == NULL)
- return NULL;
--
-+ dev->nd_net = get_exec_env()->ve_ns->net_ns;
- nt = netdev_priv(dev);
- dev->init = ipip6_tunnel_init;
- nt->parms = *parms;
-@@ -876,6 +876,7 @@ static int sit_ve_start(void *data)
- err = -ENOMEM;
- goto free_tunnel;
- }
-+ st->_ipip6_fb_tunnel_dev->nd_net = get_exec_env()->ve_ns->net_ns;
- st->_ipip6_fb_tunnel_dev->init = ipip6_fb_tunnel_init;
- err = register_netdev(st->_ipip6_fb_tunnel_dev);
- if (err < 0)
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch
deleted file mode 100644
index 9c7b5d5fbcb5..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Peter Volkov <pva@gentoo.org>
-Date: Mon, 3 Mar 2008 09:52:27 +0000 (+0300)
-Subject: Fix proc compilation
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=da23c1831f33ce142b38534f8e54f985f651707c;hp=9c10803877cbf58bebe511eafa67fee2c615f6f6
-
-Fix proc compilation
-
-fs/proc/generic.c: In function 'xlate_proc_loc_name':
-fs/proc/generic.c:330: error: implicit declaration of function 'get_exec_env'
-fs/proc/generic.c:330: error: invalid type argument of '->'
-fs/proc/generic.c: In function 'proc_lookup':
-fs/proc/generic.c:516: error: implicit declaration of function 've_is_super'
----
-
-diff --git a/fs/proc/generic.c b/fs/proc/generic.c
-index ff8484e..2260a20 100644
---- a/fs/proc/generic.c
-+++ b/fs/proc/generic.c
-@@ -22,6 +22,7 @@
- #include <linux/bitops.h>
- #include <linux/spinlock.h>
- #include <linux/completion.h>
-+#include <linux/sched.h>
- #include <asm/uaccess.h>
-
- #include "internal.h"
-diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
-index a5e8cd9..a3da5a0 100644
---- a/fs/proc/proc_tty.c
-+++ b/fs/proc/proc_tty.c
-@@ -13,6 +13,7 @@
- #include <linux/stat.h>
- #include <linux/tty.h>
- #include <linux/seq_file.h>
-+#include <linux/sched.h>
- #include <linux/bitops.h>
-
- static int tty_ldiscs_read_proc(char *page, char **start, off_t off,
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch
deleted file mode 100644
index 8d718fa0933e..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Alexey Dobriyan <adobriyan@openvz.org>
-Date: Tue, 4 Mar 2008 09:24:54 +0000 (+0300)
-Subject: CPT: reexport sys_open()
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=29ec264a595bb385ce4818a31a01987b3b31fd9c;hp=73980b5b87e7619ba49364d2618b25d4f4bd8450
-
-CPT: reexport sys_open()
-
-http://bugzilla.openvz.org/show_bug.cgi?id=835
----
-
-diff --git a/fs/open.c b/fs/open.c
-index 305f7e5..110be4d 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -1101,7 +1101,7 @@ asmlinkage long sys_open(const char __user *filename, int flags, int mode)
- prevent_tail_call(ret);
- return ret;
- }
--EXPORT_UNUSED_SYMBOL_GPL(sys_open); /* To be deleted for 2.6.25 */
-+EXPORT_SYMBOL_GPL(sys_open);
-
- asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
- int mode)
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch
deleted file mode 100644
index 11ee11e2e07a..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugzilla.openvz.org/show_bug.cgi?id=837
-
-From: Alexey Dobriyan <adobriyan@openvz.org>
-Date: Mon, 3 Mar 2008 12:02:38 +0000 (+0300)
-Subject: SLUBC: change SLAB_UBC, SLAB_NO_CHARGE flags
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.24-openvz;a=commitdiff_plain;h=73980b5b87e7619ba49364d2618b25d4f4bd8450
-
-SLUBC: change SLAB_UBC, SLAB_NO_CHARGE flags
-
-SLAB_NO_CHARGE conflicted with __SYSFS_ADD_DEFERRED internal flag
-which resulted in double and broken additional directories created
-in /sys/slab/ .
----
-
-diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 2ff029a..793613f 100644
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
-@@ -62,8 +62,8 @@
- * poll, fdsets, ...) non-ub allocs)
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
--#define SLAB_UBC 0x20000000UL /* alloc space for ubs ... */
--#define SLAB_NO_CHARGE 0x40000000UL /* ... but don't charge */
-+#define SLAB_UBC 0x10000000UL /* alloc space for ubs ... */
-+#define SLAB_NO_CHARGE 0x20000000UL /* ... but don't charge */
-
- /*
- * struct kmem_cache related prototypes
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.24.004.1.ebuild
index 7364ec59fb66..62fdca7c4a41 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.24.004.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild,v 1.1 2008/03/05 10:07:26 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.24.004.1.ebuild,v 1.1 2008/04/02 09:43:41 pva Exp $
inherit versionator
@@ -32,10 +32,4 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI}
UNIPATCH_STRICTORDER=1
UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz
-${FILESDIR}/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch
-${FILESDIR}/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch
-${FILESDIR}/openvz-sources-2.6.24.002.2-proc-compilation.patch
-${FILESDIR}/openvz-sources-2.6.24.002.2-reexport-sys_open.patch
-${FILESDIR}/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch
-${FILESDIR}/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch
"