From fe59d5bc48ec1a6c208c855c62d70f78b9a69288 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Thu, 22 Apr 2010 19:26:20 +0000 Subject: [PATCH] Added 2.6.32 based kernel, bug #310795, thank Ziga Boehm and Aleksandr Zagzin for report. 2.6.27.4.1-r1 amd64/x86 stable, bug #198632. Dropped old. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- sys-kernel/openvz-sources/ChangeLog | 13 +++++- sys-kernel/openvz-sources/Manifest | 12 +++-- .../openvz-sources-2.6.18.028.068.3-r1.ebuild | 44 ------------------- .../openvz-sources-2.6.18.028.068.5.ebuild | 44 ------------------- .../openvz-sources-2.6.27.4.1-r1.ebuild | 4 +- ...build => openvz-sources-2.6.32.2.1.ebuild} | 4 +- 6 files changed, 21 insertions(+), 100 deletions(-) delete mode 100644 sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3-r1.ebuild delete mode 100644 sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild rename sys-kernel/openvz-sources/{openvz-sources-2.6.27.4.1.ebuild => openvz-sources-2.6.32.2.1.ebuild} (95%) diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog index c1030dcf2f20..a71b9ba1be7a 100644 --- a/sys-kernel/openvz-sources/ChangeLog +++ b/sys-kernel/openvz-sources/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/openvz-sources # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.130 2010/04/16 09:48:23 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.131 2010/04/22 19:26:20 pva Exp $ + +*openvz-sources-2.6.32.2.1 (22 Apr 2010) + + 22 Apr 2010; Peter Volkov + -openvz-sources-2.6.18.028.068.3-r1.ebuild, + -openvz-sources-2.6.18.028.068.5.ebuild, + -openvz-sources-2.6.27.4.1.ebuild, openvz-sources-2.6.27.4.1-r1.ebuild, + +openvz-sources-2.6.32.2.1.ebuild: + Added 2.6.32 based kernel, bug #310795, thank Ziga Boehm and Aleksandr + Zagzin for report. 2.6.27.4.1-r1 amd64/x86 stable, bug #198632. Dropped + old. *openvz-sources-2.6.27.4.1-r1 (13 Apr 2010) diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest index eb056cc08bcb..5c947a5e848a 100644 --- a/sys-kernel/openvz-sources/Manifest +++ b/sys-kernel/openvz-sources/Manifest @@ -8,16 +8,14 @@ AUX openvz-sources-2.6.27.4.1-splice.patch 1206 RMD160 db6fcb34fc1fc60ccf47eeb24 AUX openvz-sources-2.6.27.4.1-task-state-percpu-counters.patch 1281 RMD160 359f479dd384a36242b158f3e1db691e9e51342d SHA1 2a6cb0c70a4a0238965a4b858c984a15a65963ba SHA256 48080364f8cae100b027b3a10eec70c8ef33b407c71c0f1e304d104f4e5f859e DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393 -DIST patch-164.11.1.el5.028stab068.3-combined.gz 15482070 RMD160 41417473a56b8fd539b547e24e98a785a173a889 SHA1 56580b60c74f7a983c6e6e20b99690b64680f225 SHA256 5f3f44e7f691cd195b4c280659c855f95896691e6922a65333f1a62c75233629 -DIST patch-164.11.1.el5.028stab068.5-combined.gz 15481639 RMD160 917405b48e80088eac129ecec2d19f9f60ca0422 SHA1 1a165afd64631a90851118b19a0753a4f52df463 SHA256 8de1085fe7eceb84ce3736ff008ff232d3f765f813ff28c84d25f0e879226071 +DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e DIST patch-164.15.1.el5.028stab068.9-combined.gz 15495065 RMD160 6750a65315682f7020efbae19fa1fc901c2567b8 SHA1 4a701a4b35170d6b24892be0f5fe5f92b8c061c5 SHA256 f498dca87b326cb86937eeb519a714fa4cba92eedc91c9412e193be79dcdbdbf +DIST patch-atkov.1-combined.gz 880450 RMD160 9fc418e910f895445bf8f61b194240246ce25466 SHA1 61083632c1a9146d8e33e7a6e56aff3f8beb60f6 SHA256 9f790d49f1c7b0756e4d872833528ab920703e007f6796a15fea56338010ce6b DIST patch-chistyakov.1-combined.gz 1060640 RMD160 e66907ff56a7764591778bf82bfd2e9d34487732 SHA1 bea1905c4b00d1621cb4d872aedd03393f576a56 SHA256 d9d8b92cc236ac268bcfd23360f2e168a9154d3492d14bb1091c5a9af78fadf3 DIST patch-kiprensky.1-combined.gz 1092532 RMD160 3995799ef6156476a47d36da07a81d71f0078820 SHA1 1b72e628bc7efa7e9cfd915de23f007f2ea9acc9 SHA256 b0d8cd33875ab64813ec995b6ae44515f8eedec9a0884631e4ade0fa00e971ba -EBUILD openvz-sources-2.6.18.028.068.3-r1.ebuild 1869 RMD160 3f4cdda463f7962a2fe17318fab709e2dca3d55b SHA1 5d228ede4f36f3ed6cf1aa86e51928209eaf6ce0 SHA256 50b49d4413175b0ce2091e8bbcf9e540fc5bf527d684f8fd89260a79bebe0302 -EBUILD openvz-sources-2.6.18.028.068.5.ebuild 1884 RMD160 046228a19828afe7e1afb67e54f1e4e2a275dee2 SHA1 2d41fd0e48f2b2e5caf025fa0d1da80f7990fdfa SHA256 5bd5bacded2104d17afed324c8adc17a81cc80d63295e6641844cb0a670084a4 EBUILD openvz-sources-2.6.18.028.068.9.ebuild 1884 RMD160 e22c41c7c33803894a12f74f2582f9cf38251236 SHA1 9e3312467b9ce0c8be0aafe69d8a2d60e17b2c88 SHA256 abf36f763bc4c529ac34244d7c62c01d0e6164ebed6d1e34be50553a33c2e302 EBUILD openvz-sources-2.6.27.3.1.ebuild 1894 RMD160 f7e40525eb6d532490c3c7da77e361217cf708de SHA1 38765a51769221e24f81273e3c60ce316393d468 SHA256 999b13c06aff4b54c6a1897bccafadaa9d03657314ba25e557d8f7096c54f700 -EBUILD openvz-sources-2.6.27.4.1-r1.ebuild 2241 RMD160 3263449195ef198b325404ed5d2869bf849eb3d1 SHA1 61f4a205daaa2862c670380350e74873f88e9695 SHA256 702ed72e9ac15d6ae38010cfef77c5925179a090bcda75899311d4b0e6b05c23 -EBUILD openvz-sources-2.6.27.4.1.ebuild 1895 RMD160 ac9c121529a21840b11f161799f063d029a93645 SHA1 9e123ffe3318512228036821aeb2c657691ca163 SHA256 a8669d01e94f57b84320ed2fcd59c9c59715d3883a2794182de9f6b394ecac8f -MISC ChangeLog 33549 RMD160 9818bafc0bcd476a0feabe6dcfd2f5c01b154311 SHA1 c21de567d53b52ec5b558731c3a9b1560118ad9b SHA256 4c63ef9d390e3a49ba538452c5dfeb74d86822f5eae8ebec8abdae6a2b11b997 +EBUILD openvz-sources-2.6.27.4.1-r1.ebuild 2239 RMD160 6cc7cdd6cc74a31a133d61a97e32fddb58cbf36b SHA1 1cb202a9848b6b9875ca5f8775bd4bd09f05d746 SHA256 af536593fc52d80e91efcdef716f5b3344198f2590faec7e2c6157cfe5211eac +EBUILD openvz-sources-2.6.32.2.1.ebuild 1891 RMD160 2d33fbfe32ad9e8091172b47b3ac2f700844f739 SHA1 b1c9e6890257c6fa4a9543feb3c0d2ff6dbf62ca SHA256 c8aa5334a82759c34d4bdd14244d25cfae33f42c1e16837782ff0cf423ed29eb +MISC ChangeLog 33991 RMD160 539ab38c8c3a1189107219b75fa40679678ad708 SHA1 55e85b80493fb40d875b4b89fc00a05a49afa9fb SHA256 07e60de7e4da4ca9fe60fbc04bd999fabd943e3bae669570f7efdddcf88756c9 MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31 diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3-r1.ebuild deleted file mode 100644 index 6c37ce706def..000000000000 --- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 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.18.028.068.3-r1.ebuild,v 1.1 2010/03/05 13:37:58 pva Exp $ - -inherit versionator - -ETYPE="sources" - -CKV=$(get_version_component_range 1-3) -OKV=${OKV:-${CKV}} -if [[ ${PR} == "r0" ]]; then -KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6) -else -KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)-${PR} -fi -OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)" -OVZ_REV="$(get_version_component_range 6)" -EXTRAVERSION=-${OVZ_KERNEL} -KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" - -inherit kernel-2 -detect_version - -KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86" -IUSE="" -PATCHV="164.11.1.el5" -DESCRIPTION="Full sources including OpenVZ patchset for the 2.6.18 kernel tree" -HOMEPAGE="http://www.openvz.org" -SRC_URI="${KERNEL_URI} ${ARCH_URI} - http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz" - -UNIPATCH_STRICTORDER=1 -UNIPATCH_LIST="${DISTDIR}/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz -${FILESDIR}/${P}-build-fix.patch -${FILESDIR}/${PN}-2.6.18.028.064.7-bridgemac.patch" - -K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel. -This patchset considered to be more stable and security supported by upstream, -that why they suggested us to use it. But note: RHEL5 patchset is very fragile -and fails to build in many configurations so if you have problems use config -files from openvz team http://wiki.openvz.org/Download/kernel/rhel5/${OVZ_KERNEL}" - -K_EXTRAEWARN="This kernel is stable only when built with gcc-4.1.x and is known -to oops in random places if built with newer compilers." diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild deleted file mode 100644 index 67bfe82b93a3..000000000000 --- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 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.18.028.068.5.ebuild,v 1.1 2010/03/26 07:29:22 pva Exp $ - -inherit versionator - -ETYPE="sources" - -CKV=$(get_version_component_range 1-3) -OKV=${OKV:-${CKV}} -if [[ ${PR} == "r0" ]]; then -KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6) -else -KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)-${PR} -fi -OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)" -OVZ_REV="$(get_version_component_range 6)" -EXTRAVERSION=-${OVZ_KERNEL} -KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2" - -inherit kernel-2 -detect_version - -KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86" -IUSE="" -PATCHV="164.11.1.el5" -DESCRIPTION="Full sources including OpenVZ patchset for the 2.6.18 kernel tree" -HOMEPAGE="http://www.openvz.org" -SRC_URI="${KERNEL_URI} ${ARCH_URI} - http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz" - -UNIPATCH_STRICTORDER=1 -UNIPATCH_LIST="${DISTDIR}/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz -${FILESDIR}/${PN}-2.6.18.028.068.3-build-fix.patch -${FILESDIR}/${PN}-2.6.18.028.064.7-bridgemac.patch" - -K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel. -This patchset considered to be more stable and security supported by upstream, -that why they suggested us to use it. But note: RHEL5 patchset is very fragile -and fails to build in many configurations so if you have problems use config -files from openvz team http://wiki.openvz.org/Download/kernel/rhel5/${OVZ_KERNEL}" - -K_EXTRAEWARN="This kernel is stable only when built with gcc-4.1.x and is known -to oops in random places if built with newer compilers." diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1-r1.ebuild index fead769b1898..830eb4e61d73 100644 --- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1-r1.ebuild +++ b/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.27.4.1-r1.ebuild,v 1.1 2010/04/16 09:48:23 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1-r1.ebuild,v 1.2 2010/04/22 19:26:20 pva Exp $ inherit versionator @@ -41,7 +41,7 @@ if [[ ${PR} != r0 ]]; then SLOT+=-${PR} fi -KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86" IUSE="" DESCRIPTION="Kernel sources with OpenVZ patchset" diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.2.1.ebuild similarity index 95% rename from sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild rename to sys-kernel/openvz-sources/openvz-sources-2.6.32.2.1.ebuild index f7c941dde885..9738b9c07b74 100644 --- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.4.1.ebuild +++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.27.4.1.ebuild,v 1.1 2010/03/26 07:29:22 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.2.1.ebuild,v 1.1 2010/04/22 19:26:20 pva Exp $ inherit versionator @@ -8,7 +8,7 @@ inherit versionator # comparisment working we have to use numbers instead of strings, that is 4th # component of our version. So we have aivazovsky - 1, briullov - 2 and so on. # Keep this string on top since we have to modify it each new release. -OVZ_CODENAME="kiprensky" +OVZ_CODENAME="atkov" OVZ_CODENAME_SUBRELEASE=$(get_version_component_range 5) #http://download.openvz.org/kernel/branches/2.6.27/2.6.27-chistyakov.1/patches/patch-chistyakov.1-combined.gz -- 2.26.2