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

(Portage version: 2.1.10.15/cvs/Linux x86_64)

3 files changed, 53 insertions, 44 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/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}"
+