New development snapshot from upstream. Removed old.

(Portage version: 2.1.4.4)

8 files changed, 16 insertions, 180 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/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
 "