Drop old. Add masked RHEL6 kernel. Test it and report issues.

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

4 files changed, 56 insertions, 47 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index f6ef3545c828..7f3f8611d46d 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.168 2011/09/07 07:33:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.169 2011/09/29 07:57:07 pva Exp $
+
+*openvz-sources-2.6.32.37.1 (29 Sep 2011)
+
+  29 Sep 2011; Peter Volkov <pva@gentoo.org>
+  -openvz-sources-2.6.18.028.092.2.ebuild, +openvz-sources-2.6.32.37.1.ebuild:
+  Drop old. Add masked RHEL6 kernel. Test it and report issues.
 
 *openvz-sources-2.6.18.028.093.2 (07 Sep 2011)
 
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 142f2ea44fae..31581d356aaf 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -7,13 +7,13 @@ DIST deblob-check-2.6.32 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562
 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 linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c618039c SHA1 410b4fc818023bfef60064e973ff0ab46d3bfb19 SHA256 5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
-DIST patch-238.19.1.el5.028stab092.2-combined.gz 19588519 RMD160 87299c50cdee152e3229c6519a84cf183512b633 SHA1 8b7f95c2c773b0c1535fb778db80a9d7889669a8 SHA256 00afafbf0de6046d18d0d3e4f768b99ad8e557922deccf8e39de942b98a8c7f3
+DIST patch-042stab037.1-combined.gz 15796988 RMD160 5e04ec5185c2227b6cbf68ef00bf3aba1d5d7b72 SHA1 5328c7c3f40449cfdc81f96d088ceb590f5cd3ee SHA256 ab9c447f2da34e0d321a0a1e264f0a880bc21a91863932bed92848c2b7cb2a06
 DIST patch-274.el5.028stab093.2-combined.gz 21299623 RMD160 9509d7e8c8dcd2d631782ae45398112757818e8f SHA1 669a66c3eeea41a3bc36cb897cd225cbb063b280 SHA256 eba796b247ec4d85584db77047d1bb2d64d69ea3915360e0a54e34289d104060
 DIST patch-feoktistov.1-combined.gz 1355929 RMD160 ccbd50e0f3d2372d4cc59dc1aed253e997566a33 SHA1 e979dacb7679a63ef8263a8cb5ce5640e6d2bd97 SHA256 0edab86be0a13f0f865e1bbd9b83b61188fd8ecd24b2b0c582b076b6872ddeb5
 DIST patch-repin.1-combined.gz 1151642 RMD160 751b0cf0226c0e5f91ab709f718b72caa4998f0f SHA1 7aeda62cf6be7cb84b6756de8d62eae370f77452 SHA256 5c81b2f6e0fcdd0f78f8209634f0e989bb986738efe0fec2b5d355a8cd5f9ea7
-EBUILD openvz-sources-2.6.18.028.092.2.ebuild 1844 RMD160 400d2275423812e016a138d1750b32bfef0f311a SHA1 5e64628b7b58f641b9bf1d6d150bdd6c2fbe5850 SHA256 61619242af08b75f82448344137cbebd23278620dd2048227a95b95874c86a6e
 EBUILD openvz-sources-2.6.18.028.093.2.ebuild 1839 RMD160 b55f8b126ad929fc412eddf8188980d849008ed7 SHA1 01a20190a0e107f82310d2815a72b541c5295ea4 SHA256 6d9a71ca7a153dde09a062bd97077d49246cb82c4001b1156c7238583dafa1b5
 EBUILD openvz-sources-2.6.27.9.1.ebuild 1889 RMD160 c7ee49a28480dac5d41922ef6731f82e871a3f38 SHA1 23b304ac4973102741ce36cde3e8793d51479b42 SHA256 d8d65a6b40dbeedfb70f007777a0ec31aec4dbd623c2df3d702d6b7bf6471c11
 EBUILD openvz-sources-2.6.32.11.1.ebuild 1835 RMD160 daf01437180cc570f1afd64eb9f20b932d895034 SHA1 cbd4c14e75bde531dd326ba112051d5236c5f8e2 SHA256 78c6206fd2aa430baa130b98a48e892f0ef6330cf43f857aad5b9e668915f6df
-MISC ChangeLog 43006 RMD160 bb70c60f736a7051f0083167319fc3b6102fcffd SHA1 7cd1f0e89ee93313fc282864863d4affca133373 SHA256 c2ba4e6b95ffa1389fa6a45dc76ca8a6757e0e5968331849945bf48b8c2e5372
+EBUILD openvz-sources-2.6.32.37.1.ebuild 1578 RMD160 2653d60613a2f8c5d9b5fd0f99e2df5b0a06650e SHA1 567db32f348609d7d89fa9b6d47998478a3cd85d SHA256 c024626c9cdf29341b01e005a81f2d654a98f7f4aeda69a6b4359640ae8ed72a
+MISC ChangeLog 43238 RMD160 a2e05ef5744e5f693bd27aca3f82d13f149e8cdd SHA1 521da833d2357b02d3b449ba3fe39a6ee302c3fa SHA256 923f5c748ca43766c8f6e821ce8bc555798ddd34e8b06eef4f0b13a54b206525
 MISC metadata.xml 681 RMD160 2506e8f34c2b1c706419e24c14ae0dbce7912a5f SHA1 bc3c7c37e15a4ffc097a823eb3a0758364781c9b SHA256 1a1794adcc3b2443635b21dee50f86ac796c7fdc44a276f8852357f8bedde9b8
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.092.2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.092.2.ebuild
deleted file mode 100644
index 90d34cc90713..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.092.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 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.092.2.ebuild,v 1.1 2011/07/28 07:10:46 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="238.19.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.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}.${OVZ_REV}"
-
-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.32.37.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.37.1.ebuild
new file mode 100644
index 000000000000..80f442e60f1d
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.37.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 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.32.37.1.ebuild,v 1.1 2011/09/29 07:57:07 pva Exp $
+
+inherit versionator
+
+OVZ_KV="0$(get_version_component_range 4).$(get_version_component_range 5)"
+
+ETYPE="sources"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != r0 ]]; then
+	KV_FULL+=-${PR}
+	EXTRAVERSION+=-${PR}
+fi
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+inherit kernel-2
+detect_version
+
+KEYWORDS=""
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/rhel6-${CKV}/042stab${OVZ_KV}/patches/patch-042stab${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-042stab${OVZ_KV}-combined.gz"
+
+K_EXTRAEINFO="This openvz kernel uses RHEL6 patchset instead of vanilla kernel.
+This patchset considered to be more stable and security supported by upstream,
+but for us RHEL6 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/rhel6/042stab${OVZ_KV}"
+