From 670d9171b3918edc970b02ac6e287f34a33e522e Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Wed, 5 Mar 2008 10:07:27 +0000 Subject: [PATCH] Backported patches from upstream to fix compilation and some other problems. Package-Manager: portage-2.1.4.4 --- sys-kernel/openvz-sources/ChangeLog | 15 +++++++- sys-kernel/openvz-sources/Manifest | 10 ++++- ...s-2.6.24.002.2-CPT-select-PM-as-well.patch | 24 ++++++++++++ ....2-CPT-select-tun-venet-veth-modules.patch | 27 +++++++++++++ ...-create-sit-devices-in-correct-netns.patch | 31 +++++++++++++++ ...ources-2.6.24.002.2-proc-compilation.patch | 38 +++++++++++++++++++ ...urces-2.6.24.002.2-reexport-sys_open.patch | 23 +++++++++++ ...-2.6.24.002.2-warning-fs-sysfs-dir.c.patch | 29 ++++++++++++++ ... => openvz-sources-2.6.24.002.2-r1.ebuild} | 21 ++++++++-- 9 files changed, 211 insertions(+), 7 deletions(-) create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch create mode 100644 sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch rename sys-kernel/openvz-sources/{openvz-sources-2.6.24.002.2.ebuild => openvz-sources-2.6.24.002.2-r1.ebuild} (55%) diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog index eae4d69f5266..8d224327af91 100644 --- a/sys-kernel/openvz-sources/ChangeLog +++ b/sys-kernel/openvz-sources/ChangeLog @@ -1,6 +1,19 @@ # 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.86 2008/03/01 19:45:12 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.87 2008/03/05 10:07:26 pva Exp $ + +*openvz-sources-2.6.24.002.2-r1 (05 Mar 2008) + + 05 Mar 2008; + +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.ebuild, + +openvz-sources-2.6.24.002.2-r1.ebuild: + Backported patches from upstream to fix compilation and some other problems. *openvz-sources-2.6.24.002.2 (01 Mar 2008) diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest index 2881e63895c9..4cc5283fd9a5 100644 --- a/sys-kernel/openvz-sources/Manifest +++ b/sys-kernel/openvz-sources/Manifest @@ -1,9 +1,15 @@ 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-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.ebuild 1080 RMD160 e87e621482436bb138a6349fba7880b957fb4698 SHA1 c5223e38f0b6b9e8363c12689ea831d8e6715a5b SHA256 a040c33f7d85b665162a70b9a0cf0fcb5d7da9583fbbf64e188a16798a41d4bd -MISC ChangeLog 19401 RMD160 eab39f970b5cc96ef954219dba4101ccbb914bf1 SHA1 df1c39d8e2ca88c5a35556420760d98272797fa3 SHA256 637e7adbc1c2ff319b94ef86658bf584029ab30c5afa0a3838000e31b756f116 +EBUILD openvz-sources-2.6.24.002.2-r1.ebuild 1715 RMD160 55aa52b4ccc2843174c0833780cb9895af152fbf SHA1 d8c7c02fc14ae07f6ca1bc818a93c22b0f596df4 SHA256 510fe81c5525837f7f721f2a8a931df4e1b9544ec29d8a5f760286ac53fb8063 +MISC ChangeLog 20059 RMD160 f090f54208fb77e0712872f49cf2ac68fa569e55 SHA1 4af5fc3903401bb4297efcbbbdd2bb48733eb503 SHA256 0a567ec9a7477b7fbf6405bba831c47931d742828c165d5e5098e29ee985e5e6 MISC metadata.xml 624 RMD160 7ad21d7bb5c38289c9a3d920c724aba031e8be57 SHA1 af0533432c352cfb2227b1073b95bbffad22b174 SHA256 726f26b7cb019e4e106eb1f222e8e5c0adc3624137f5678f18f2ed0026ed1674 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 new file mode 100644 index 000000000000..0f3d3c5a563f --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-PM-as-well.patch @@ -0,0 +1,24 @@ +From: Alexey Dobriyan +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 new file mode 100644 index 000000000000..cc6b40bff491 --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-CPT-select-tun-venet-veth-modules.patch @@ -0,0 +1,27 @@ +From: Alexey Dobriyan +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 new file mode 100644 index 000000000000..e73502c20d09 --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-SIT-create-sit-devices-in-correct-netns.patch @@ -0,0 +1,31 @@ +From: Alexey Dobriyan +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 new file mode 100644 index 000000000000..9c7b5d5fbcb5 --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-proc-compilation.patch @@ -0,0 +1,38 @@ +From: Peter Volkov +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 + #include + #include ++#include + #include + + #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 + #include + #include ++#include + #include + + 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 new file mode 100644 index 000000000000..8d718fa0933e --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-reexport-sys_open.patch @@ -0,0 +1,23 @@ +From: Alexey Dobriyan +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 new file mode 100644 index 000000000000..11ee11e2e07a --- /dev/null +++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.24.002.2-warning-fs-sysfs-dir.c.patch @@ -0,0 +1,29 @@ +http://bugzilla.openvz.org/show_bug.cgi?id=837 + +From: Alexey Dobriyan +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.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild similarity index 55% rename from sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2.ebuild rename to sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild index f0c46e6c2eb3..7364ec59fb66 100644 --- a/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2.ebuild +++ b/sys-kernel/openvz-sources/openvz-sources-2.6.24.002.2-r1.ebuild @@ -1,16 +1,22 @@ # 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.ebuild,v 1.1 2008/03/01 19:45:12 pva Exp $ +# $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 $ inherit versionator ETYPE="sources" + CKV=$(get_version_component_range 1-3) OKV=${OKV:-${CKV}} -KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4) OVZ_KERNEL="ovz$(get_version_component_range 4)" -OVZ_REV="$(get_version_component_range 5)" +if [[ ${PR} == "r0" ]]; then +KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5) EXTRAVERSION=-${OVZ_KERNEL} +else +KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)-${PR} +EXTRAVERSION=-${OVZ_KERNEL}-${PR} +fi +OVZ_REV="$(get_version_component_range 5)" KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" inherit kernel-2 @@ -25,4 +31,11 @@ SRC_URI="${KERNEL_URI} ${ARCH_URI} http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz" UNIPATCH_STRICTORDER=1 -UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz" +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 +" -- 2.26.2