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

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 79 insertions, 2 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/Manifest b/sys-kernel/openvz-sources/Manifest
index cdba27a529bf..a487475d9784 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,11 +1,13 @@
 AUX openvz-sources-2.6.18.028.064.7-bridgemac.patch 514 RMD160 bdd04c4dc86c79b91b7675d8c59b569483e444c4 SHA1 ef092a68c4dab7dc7284b2be8cc74b1510def485 SHA256 250bc852aedca35624d9352c1d693e147812504b2799cd2ba20f0c9763e61908
+AUX openvz-sources-2.6.18.028.068.3-build-fix.patch 742 RMD160 1c6e51e8e9d490cfeae747229deafbe129b73be6 SHA1 9e21887303534a76956ba8cafdd31c7168f8eae1 SHA256 0e04df4445fcea66ea771b727dc50800ff4e7065fc5cda3767f8a5fedee9b786
 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.10.1.el5.028stab067.4-combined.gz 15462669 RMD160 6901b718b0cfc012fbc327b2f8776bac6ab5e156 SHA1 509f8e1b0c6a9c331582a44bd6c611ebf39af901 SHA256 7d74f17b73218355457611bbf7dafababc52c98f5c24839f81373c445e7a2d5e
 DIST patch-164.11.1.el5.028stab068.3-combined.gz 15482070 RMD160 41417473a56b8fd539b547e24e98a785a173a889 SHA1 56580b60c74f7a983c6e6e20b99690b64680f225 SHA256 5f3f44e7f691cd195b4c280659c855f95896691e6922a65333f1a62c75233629
 DIST patch-chistyakov.1-combined.gz 1060640 RMD160 e66907ff56a7764591778bf82bfd2e9d34487732 SHA1 bea1905c4b00d1621cb4d872aedd03393f576a56 SHA256 d9d8b92cc236ac268bcfd23360f2e168a9154d3492d14bb1091c5a9af78fadf3
 EBUILD openvz-sources-2.6.18.028.067.4.ebuild 1833 RMD160 345ddf6f895d858e565868a42599a9f96e48d889 SHA1 0d292863543aceaad3910669f2a3606cd899e57f SHA256 09013035d62162f00205370d2dc734bcc14d1bc4a4b006f775116c6f5723c909
+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.3.ebuild 1833 RMD160 42a24e6434f5b41c2f53b406e1702230ab371274 SHA1 13c113e589c2cee892be378603295d58be4ac430 SHA256 67f5512eb3bad1fb79db7c200bcabc7c9df47ba558ac95335ce501721714fdba
 EBUILD openvz-sources-2.6.27.3.1.ebuild 1894 RMD160 f7e40525eb6d532490c3c7da77e361217cf708de SHA1 38765a51769221e24f81273e3c60ce316393d468 SHA256 999b13c06aff4b54c6a1897bccafadaa9d03657314ba25e557d8f7096c54f700
-MISC ChangeLog 32253 RMD160 c1066d52c4b1391d19dfc02e2a54d0cac3c2171c SHA1 0d2b05dc254972315684ef0663ae55daee56f70d SHA256 b5c91926a350cbb0758c686efed94ac1b8b99c4f189fe2ea9675b394459d5215
+MISC ChangeLog 32520 RMD160 76bdd30f7f1e073579963cc7678a21942084f22d SHA1 f1c2c2a2a8c2a5ccc3518d0f28c4e06c5a5517a2 SHA256 cbcf6dfe71b36ffdcf40da3dde07cf615b9abd6c139cfd29c60dc319dbce3536
 MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31
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."