Version bump. Drop old. Cleanup - made sources again installable. Fixed build issue in 2.6.32 with new toolchain, bug #388103 wrt Aleksandr Zagzin and Peter Gantner.

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

7 files changed, 114 insertions, 82 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index ed8ce910dc57..bd07cfd1d8db 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,19 @@
 # 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.172 2011/10/21 09:28:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.173 2011/12/12 05:24:44 pva Exp $
+
+*openvz-sources-2.6.32.39.11 (12 Dec 2011)
+*openvz-sources-2.6.18.028.095.1 (12 Dec 2011)
+
+  12 Dec 2011; Peter Volkov <pva@gentoo.org>
+  -openvz-sources-2.6.18.028.094.3.ebuild,
+  +openvz-sources-2.6.18.028.095.1.ebuild, -openvz-sources-2.6.27.9.1.ebuild,
+  openvz-sources-2.6.32.11.1.ebuild, -openvz-sources-2.6.32.39.3.ebuild,
+  +openvz-sources-2.6.32.39.11.ebuild,
+  +files/openvz-sources-2.6.32.39-binutils.patch:
+  Version bump. Drop old. Cleanup - made sources again installable. Fixed build
+  issue in 2.6.32 with new toolchain, bug #388103 wrt Aleksandr Zagzin and
+  Peter Gantner.
 
   21 Oct 2011; Peter Volkov <pva@gentoo.org> openvz-sources-2.6.32.39.3.ebuild:
   Fix url, bug #387763 wrt Vladimir Berezhnoy.
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 0019708070b5..028d97d546ea 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -3,27 +3,23 @@ Hash: SHA256
 
 AUX openvz-sources-2.6.18.028.064.7-bridgemac.patch 514 RMD160 bdd04c4dc86c79b91b7675d8c59b569483e444c4 SHA1 ef092a68c4dab7dc7284b2be8cc74b1510def485 SHA256 250bc852aedca35624d9352c1d693e147812504b2799cd2ba20f0c9763e61908
 AUX openvz-sources-2.6.32.10.1-cpt_process.c-build.patch 1355 RMD160 10ed708f8981a8da5c48e85f8d4ab92fd8c52a6b SHA1 34623bd06d781e25ed18781bc48a30ffc3a0f29d SHA256 5d3c0cd848f2546025374b1da77fb34bbae85bdf955bf21e9451c03b7221457d
-DIST deblob-2.6.27 67810 RMD160 2d697e569fb4ba294c94a50798de10d2ad930b84 SHA1 45b2a16c2df2c14380cd813c74be721b9537d03d SHA256 2eab6480d170a7204b09f2c1091f2b3e4c19c3525ea4887e6887501bfa263efc
+AUX openvz-sources-2.6.32.39-binutils.patch 2977 RMD160 364b953433a0ef8d62177fa4c9221063087b4ef0 SHA1 c1ec8b759394b52fe4860ed93dd719bb55c5b4eb SHA256 dee3838732123743d327453fd991d59686ae3d5acccc8f465f96fb8721490583
 DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
-DIST deblob-check-2.6.27 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
 DIST deblob-check-2.6.32 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
 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-042stab039.3-combined.gz 15809768 RMD160 4ecc88397d7e8d03d2cf895cb745258f3a121621 SHA1 49262dca2a9f58fc8dd13b29d2661a2355798501 SHA256 1aeb9e4863747faedaa82ae133a0e8e5b1a6ce5f542fc619c63b7211d289a929
-DIST patch-274.3.1.el5.028stab094.3-combined.gz 21317316 RMD160 dcc5402ef85122ed324b78aa46d6298682429954 SHA1 9fa5d22e958db07a6d595b90e2b472420954b0c0 SHA256 806fd488c5265ab71cef52e8d60652a1b271015ec7aa89256484c230b23645c0
+DIST patch-042stab039.11-combined.gz 15807379 RMD160 11442d2d53e864d5aa27e87ba5fc4fff35cc8ccf SHA1 2d09bc23937e2dbf373a16d981ded76635be3f80 SHA256 c24265aa0ce691b4b535bf1fd7ca918a53e8ab7adc6291381949a6cdd62f2e5d
+DIST patch-274.7.1.el5.028stab095.1-combined.gz 21341692 RMD160 3c00ed9bf7380388b7997165b7911a9d77c372fb SHA1 eb75a466a610089f9d705d45c37536e08f449c14 SHA256 daac417cc43ee07b38e69aff4bdf88fac0c57ea575ce13b299828a62a7762171
 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.094.3.ebuild 1843 RMD160 62ad6c36cc9d5b450e908145b9d3009b2d07bc43 SHA1 323ee422f9b68e93e20a0ecd0c5663b2ee1f5fc8 SHA256 bb9d9cec1814c6e061a876f257462c640c6bb03f6af31942616217441b623257
-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
-EBUILD openvz-sources-2.6.32.39.3.ebuild 1610 RMD160 3ebe5f96da947c89bb308a560f3afc4763268962 SHA1 ef111baebba4191e94515534cf0bdbf9d350f6c9 SHA256 dd1a1e662e7b334d7ec66171209c02c00de066843de175fa7d86d612e3afc145
-MISC ChangeLog 43769 RMD160 58166ec8770ea1f95f3ee8918e592fd1e5bb60e0 SHA1 61c23f89808fa416e4b67f8ec9f2d66981ddf09f SHA256 dac1ad90650d6455b4bd088c3d792b8f81ba3a50765c916f0f0b6ee63c2a3b7c
+EBUILD openvz-sources-2.6.18.028.095.1.ebuild 2059 RMD160 c259d3ae7b350719ad82d4ceb6d374692df9b2b4 SHA1 c213d034471d7c2b0351419f81ef43d03cb7017d SHA256 4762d5a1c59909ccb9c9194a6d41fdcb3782c4742ec63b8f10115a524ba95dbe
+EBUILD openvz-sources-2.6.32.11.1.ebuild 1850 RMD160 ffac3a53a75354fdfc5558300311c514b011e0a5 SHA1 faeda7968e454c4047866267b58cbf7590c424bd SHA256 7b4949662a4097c02def3b5e3117aa4a10d4fe162363c7d1e30be6f62d36cfd4
+EBUILD openvz-sources-2.6.32.39.11.ebuild 1714 RMD160 11957e6117dd60ed8897ddd38b2841ca7b2970bf SHA1 6638a911673143e30548ecacf22cdc7c541f7a13 SHA256 7b028cb563defc17670ebc2673c9a0e22046db1caf69fbc4e3416cd1aaf05f77
+MISC ChangeLog 44361 RMD160 547c397df2f29036a7fa4d7f4e37b7ca18222271 SHA1 4118393280974b3ed41afe31492238b0ebfdaa35 SHA256 292f68bfcf67705e055558b994dccf3578bfeda374d19e915f64e69ea6ceedc4
 MISC metadata.xml 681 RMD160 2506e8f34c2b1c706419e24c14ae0dbce7912a5f SHA1 bc3c7c37e15a4ffc097a823eb3a0758364781c9b SHA256 1a1794adcc3b2443635b21dee50f86ac796c7fdc44a276f8852357f8bedde9b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6hOtYACgkQGrk+8vGYmweumwEAyWnDXv4TqDFy5IPrOtZXoIj1
-z+KEYxlZGePJjlKu6zABAIJfo70G6fLB6ua/8gwvHLAHOtfZ4QlM4lHNwOzJZLpR
-=OFn0
+iF4EAREIAAYFAk7lkBwACgkQGrk+8vGYmweA0gEA7LK2OYJ+yzvvVzdiI+ZXa4P+
+USutOMzxOt9tHUnKeukBAL1p38aR6GwcJfJHN3tM41q1PUZKKuyYaCRc0JmoBdrm
+=19HG
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.39-binutils.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.39-binutils.patch
new file mode 100644
index 000000000000..e6caf9ad7818
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.39-binutils.patch
@@ -0,0 +1,72 @@
+From: Alexander van Heukelum <heukelum@fastmail.fm>
+Date: Fri, 11 Mar 2011 20:59:38 +0000 (+0100)
+Subject: x86, binutils, xen: Fix another wrong size directive
+X-Git-Tag: v2.6.39-rc1~506^2
+X-Git-Url: http://git.itanic.dy.fi/?p=linux-stable;a=commitdiff_plain;h=371c394af27ab7d1e58a66bc19d9f1f3ac1f67b4
+
+x86, binutils, xen: Fix another wrong size directive
+
+The latest binutils (2.21.0.20110302/Ubuntu) breaks the build
+yet another time, under CONFIG_XEN=y due to a .size directive that
+refers to a slightly differently named (hence, to the now very
+strict and unforgiving assembler, non-existent) symbol.
+
+[ mingo:
+
+   This unnecessary build breakage caused by new binutils
+   version 2.21 gets escallated back several kernel releases spanning
+   several years of Linux history, affecting over 130,000 upstream
+   kernel commits (!), on CONFIG_XEN=y 64-bit kernels (i.e. essentially
+   affecting all major Linux distro kernel configs).
+
+   Git annotate tells us that this slight debug symbol code mismatch
+   bug has been introduced in 2008 in commit 3d75e1b8:
+
+     3d75e1b8        (Jeremy Fitzhardinge    2008-07-08 15:06:49 -0700 1231) ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
+
+   The 'bug' is just a slight assymetry in ENTRY()/END()
+   debug-symbols sequences, with lots of assembly code between the
+   ENTRY() and the END():
+
+     ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
+       ...
+     END(do_hypervisor_callback)
+
+   Human reviewers almost never catch such small mismatches, and binutils
+   never even warned about it either.
+
+   This new binutils version thus breaks the Xen build on all upstream kernels
+   since v2.6.27, out of the blue.
+
+   This makes a straightforward Git bisection of all 64-bit Xen-enabled kernels
+   impossible on such binutils, for a bisection window of over hundred
+   thousand historic commits. (!)
+
+   This is a major fail on the side of binutils and binutils needs to turn
+   this show-stopper build failure into a warning ASAP. ]
+
+Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
+Cc: Jeremy Fitzhardinge <jeremy@goop.org>
+Cc: Jan Beulich <jbeulich@novell.com>
+Cc: H.J. Lu <hjl.tools@gmail.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: "H. Peter Anvin" <hpa@zytor.com>
+Cc: Kees Cook <kees.cook@canonical.com>
+LKML-Reference: <1299877178-26063-1-git-send-email-heukelum@fastmail.fm>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+---
+
+diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
+index aed1ffb..bbd5c80 100644
+--- a/arch/x86/kernel/entry_64.S
++++ b/arch/x86/kernel/entry_64.S
+@@ -1248,7 +1248,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
+ 	decl PER_CPU_VAR(irq_count)
+ 	jmp  error_exit
+ 	CFI_ENDPROC
+-END(do_hypervisor_callback)
++END(xen_do_hypervisor_callback)
+ 
+ /*
+  * Hypervisor uses this for application faults while it executes.
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.094.3.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.095.1.ebuild
index 9683a256e10d..852ca9f874ee 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.094.3.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.095.1.ebuild
@@ -1,6 +1,6 @@
 # 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.094.3.ebuild,v 1.1 2011/10/02 18:17:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.095.1.ebuild,v 1.1 2011/12/12 05:24:44 pva Exp $
 
 inherit versionator
 
@@ -16,14 +16,18 @@ fi
 OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
 OVZ_REV="$(get_version_component_range 6)"
 EXTRAVERSION=-${OVZ_KERNEL}
+S=${WORKDIR}/linux-${KV_FULL}
 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+# ${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})
 
 inherit kernel-2
-detect_version
 
 KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
-PATCHV="274.3.1.el5"
+PATCHV="274.7.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}
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.9.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.9.1.ebuild
deleted file mode 100644
index a8841f71de6a..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.9.1.ebuild
+++ /dev/null
@@ -1,56 +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.27.9.1.ebuild,v 1.2 2011/03/09 13:38:59 pva Exp $
-
-inherit versionator
-
-# Upstream uses string to version their releases. To make portage version
-# 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="repin"
-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
-
-OVZ_KV="${OVZ_CODENAME}.${OVZ_CODENAME_SUBRELEASE}"
-
-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
-
-SLOT=${CKV}-${OVZ_KV}
-if [[ ${PR} != r0 ]]; then
-	SLOT+=-${PR}
-fi
-
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE=""
-
-DESCRIPTION="Kernel sources with OpenVZ patchset"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KV}/patches/patch-${OVZ_KV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz"
-
-K_EXTRAEINFO="For more information about this kernel take a look at:
-http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.11.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.11.1.ebuild
index d277bbf2a0b0..92e9a9ad3215 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.11.1.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.11.1.ebuild
@@ -1,6 +1,6 @@
 # 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.11.1.ebuild,v 1.2 2011/04/01 18:19:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.11.1.ebuild,v 1.3 2011/12/12 05:24:44 pva Exp $
 
 inherit versionator
 
@@ -23,6 +23,7 @@ if [[ ${PR} != r0 ]]; then
 	KV_FULL+=-${PR}
 	EXTRAVERSION+=-${PR}
 fi
+S=${WORKDIR}/linux-${KV_FULL}
 
 # ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
 KV_MAJOR=$(get_version_component_range 1 ${OKV})
@@ -32,7 +33,6 @@ 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
 
 SLOT=${CKV}-${OVZ_KV}
 if [[ ${PR} != r0 ]]; then
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.39.3.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.39.11.ebuild
index e60d832e3ead..63b50685857a 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.39.3.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.39.11.ebuild
@@ -1,21 +1,23 @@
 # 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.39.3.ebuild,v 1.2 2011/10/21 09:28:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.39.11.ebuild,v 1.1 2011/12/12 05:24:44 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}
+K_NOSETEXTRAVERSION="yes"
+ETYPE="sources"
 KV_FULL=${CKV}${EXTRAVERSION}
-if [[ ${PR} != r0 ]]; then
+if [[ ${PR} != "r0" ]]; then
 	KV_FULL+=-${PR}
 	EXTRAVERSION+=-${PR}
 fi
+S=${WORKDIR}/linux-${KV_FULL}
 
 # ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
 KV_MAJOR=$(get_version_component_range 1 ${OKV})
@@ -25,7 +27,7 @@ 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
+#detect_version
 
 KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 IUSE=""
@@ -33,10 +35,11 @@ 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}-testing/042stab${OVZ_KV}/patches/patch-042stab${OVZ_KV}-combined.gz"
+	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"
+UNIPATCH_LIST="${DISTDIR}/patch-042stab${OVZ_KV}-combined.gz
+${FILESDIR}/openvz-sources-2.6.32.39-binutils.patch"
 
 K_EXTRAEINFO="This openvz kernel uses RHEL6 patchset instead of vanilla kernel.
 This patchset considered to be more stable and security supported by upstream,