Fixed quite common build issue, thank Jeff Mitchell for report.

(Portage version: 2.2_rc63/cvs/Linux x86_64)

3 files changed, 76 insertions, 1 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 744c68576f2c..00e20614fa7d 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.126 2010/02/19 09:27:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.127 2010/03/05 13:37:58 pva Exp $
+
+*openvz-sources-2.6.18.028.068.3-r1 (05 Mar 2010)
+
+  05 Mar 2010; Peter Volkov <pva@gentoo.org>
+  +openvz-sources-2.6.18.028.068.3-r1.ebuild,
+  +files/openvz-sources-2.6.18.028.068.3-build-fix.patch:
+  Fixed quite common build issue, thank Jeff Mitchell for report.
 
 *openvz-sources-2.6.18.028.068.3 (19 Feb 2010)
 
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch
new file mode 100644
index 000000000000..ce1e7305f4ad
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.068.3-build-fix.patch
@@ -0,0 +1,24 @@
+x86,amd_detect_cmp: Dont forget to retrieve cpu number
+
+In non-NUMA case we have to retrieve cpu number in a sake
+of HT compatibility.
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
+---
+ arch/x86_64/kernel/setup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.18-ovz/arch/x86_64/kernel/setup.c
+=====================================================================
+--- linux-2.6.18-ovz.orig/arch/x86_64/kernel/setup.c
++++ linux-2.6.18-ovz/arch/x86_64/kernel/setup.c
+@@ -857,8 +857,8 @@ static void __init amd_detect_cmp(struct
+ {
+ #ifdef CONFIG_SMP
+ 	unsigned bits;
+-#ifdef CONFIG_NUMA
+ 	int cpu = smp_processor_id();
++#ifdef CONFIG_NUMA
+ 	int node = 0;
+ 	unsigned apicid = hard_smp_processor_id();
+ #endif
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
new file mode 100644
index 000000000000..6c37ce706def
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.068.3-r1.ebuild
@@ -0,0 +1,44 @@
+# 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."