Merge in 2.6.27.54 into 2.6.27 based kernels.

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

3 files changed, 68 insertions, 2 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index c748e10f6550..6511d817d8db 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.149 2010/09/21 20:12:47 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.150 2010/09/21 20:17:01 pva Exp $
+
+*openvz-sources-2.6.27.6.1-r2 (21 Sep 2010)
+
+  21 Sep 2010; Peter Volkov <pva@gentoo.org>
+  +openvz-sources-2.6.27.6.1-r2.ebuild:
+  Merge in 2.6.27.54 into 2.6.27 based kernels.
 
 *openvz-sources-2.6.18.028.070.5 (21 Sep 2010)
 
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 6f888e229a61..b7bf937b0a6b 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -8,6 +8,7 @@ DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02
 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 openvz-2.6.27-2.6.27.53.patch.bz2 34532 RMD160 82cf5116bd2b41f47485d0d9aa5cffd327fb8921 SHA1 f791c5e099d75c263e163c8377c5a40ddf78ec53 SHA256 e540bc3df99454f6cef110e9e6758e6994ed4e94d3b0fca5727ecba5406153f7
+DIST openvz-2.6.27-2.6.27.54.patch.bz2 37530 RMD160 2610ac5a068ad3533baa35ab3976d26f04c99a71 SHA1 d07249d8fb0f051f76cf2f2469ac416a7b631b9f SHA256 b8587f2250bed1263d9993c5d49050796827df2d9c0647d4af19a931a0f31178
 DIST patch-194.8.1.el5.028stab070.4-combined.gz 18762029 RMD160 ce001155c20231b16d83ebaebd160b3a3080b7c4 SHA1 ba0e143955ec64bb1ec1bdc66a8929e9d9b66262 SHA256 f16877e8644efb9cf1e3793dd30817e3dbf1be6c9fd3e08dda3a8121ca5101d8
 DIST patch-194.8.1.el5.028stab070.5-combined.gz 18756668 RMD160 6f340f479498066ed3d2fc7eab565c55a463c750 SHA1 a6201ee34639bc84041d675c26db14003deaae50 SHA256 801874493654c72cec0daee59f4615377122b7f2028acc9d0071b8cc39ccb6f3
 DIST patch-dobrovolskiy.1-combined.gz 1216953 RMD160 94eb0e5db61c6c96304da03846ece90777799d13 SHA1 c61743f8f579f064d9bbf484f9b915c155e8f9c9 SHA256 4e78d1325e681acfbe1de6ab213a2cfb61544b1675e90dd53bb338e1a7c044d9
@@ -15,7 +16,8 @@ DIST patch-kuindzhi.1-combined.gz 1104589 RMD160 bca276d3ee8ef77a985bdbbeef118e2
 EBUILD openvz-sources-2.6.18.028.070.4.ebuild 1843 RMD160 fe359fc57fc12db48542541758401873c6505267 SHA1 30524e71a96e192217cc3489e7699cf599bd4a26 SHA256 cda7683a1800e1248a5fb20a8b63e906fb598b3a821a59605d066e14856b4e3e
 EBUILD openvz-sources-2.6.18.028.070.5.ebuild 1843 RMD160 66193e1e9403daddca5bbfac3a12b808ef4e0d66 SHA1 3248f604b91fe0ab8f6e75c5cffbc00dfb1ea324 SHA256 475fae166af06cd9e08acdb1a73fb085376e364c24608170ac8b36c95339d7b1
 EBUILD openvz-sources-2.6.27.6.1-r1.ebuild 1991 RMD160 35f04bbef9747525ac3b4971882bcf13d874a0f2 SHA1 7a2b61e4c7d58f6a8547b74d1e4f28880c8e3f3f SHA256 50fd721269da58ab867b05664a39c9e1d07e3db4834b15062c22ea5050382469
+EBUILD openvz-sources-2.6.27.6.1-r2.ebuild 1993 RMD160 d813778b8a8c6a384296c14f00db4c21ed3bfa44 SHA1 f8936b89931027a31e1533d1f4f827a36d8177bb SHA256 c810fa806ce3a1a0983785ab4c77e3d6ecf9acdbafd23d02ee7718b3b8001760
 EBUILD openvz-sources-2.6.27.6.1.ebuild 1893 RMD160 c9dde59f5b6ad9620f2317dd4dfe2dc2c9127e96 SHA1 0278d3433420eeb85d3048402e649c590de4d7bd SHA256 abe57c84794382bf9069aaf07e86b00d52226d0a9b4db0812eb420360f4bf82b
 EBUILD openvz-sources-2.6.32.8.1.ebuild 1781 RMD160 4d5e95688027345e4355ed45cb25debfbf060988 SHA1 cb7be62cdd4401604151b2765d3a8284a1b4a372 SHA256 da62dff59e33d48ada79a683065cee9f173cf97b2da5a121780c8cb6210695f5
-MISC ChangeLog 37521 RMD160 7665faf4091bc931750894689ef5eb81cf265305 SHA1 4975bdc15ab582184dc7fcda09616af0a3ac23d3 SHA256 15110585d4ab136fa15b6446fe19db9255691d0d9afc816f391b210fd9912a49
+MISC ChangeLog 37700 RMD160 d4a0f8bee1bd5239e37e69f4883a849cd4a6762e SHA1 81b88255b41dccdef976ff75e03950cf3ebd2d79 SHA256 ce90dae882f0ce14c4e3b59206fcdebe504e7be310cc7f32ba00f05e65ec0e61
 MISC metadata.xml 681 RMD160 2506e8f34c2b1c706419e24c14ae0dbce7912a5f SHA1 bc3c7c37e15a4ffc097a823eb3a0758364781c9b SHA256 1a1794adcc3b2443635b21dee50f86ac796c7fdc44a276f8852357f8bedde9b8
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.6.1-r2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.6.1-r2.ebuild
new file mode 100644
index 000000000000..352090ca7f2e
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.27.6.1-r2.ebuild
@@ -0,0 +1,58 @@
+# 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.27.6.1-r2.ebuild,v 1.1 2010/09/21 20:17:01 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="kuindzhi"
+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
+	mirror://gentoo/openvz-2.6.27-2.6.27.54.patch.bz2"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz
+${DISTDIR}/openvz-2.6.27-2.6.27.54.patch.bz2"
+
+K_EXTRAEINFO="For more information about this kernel take a look at:
+http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"