Update calculate-builder for support kernel3.

atratsevskiy
Mike Hiretsky 13 years ago
parent 936e642aab
commit 743b1c9c0e

@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-builder-2.2.22-r2 (30 Aug 2011)
30 Aug 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-builder-2.2.22-r2.ebuild,
+files/calculate-builder-2.2.22-kernel_3.patch:
Update for kernel 3 support
*calculate-builder-2.2.22-r1 (29 Aug 2011)
29 Aug 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -1,5 +1,6 @@
AUX calculate-builder-2.2.19_2.2.20_rc1.patch 1927 RMD160 5c5f11e5397b04c022bc3307fcc81defcacdf5c4 SHA1 eb0ff12a50ab216d5443b93023dfa201891f6a3b SHA256 5f9b5fa5ceebf676d464f71cdfa8a235653af628b0c6f19be5272c6688a640c5
AUX calculate-builder-2.2.22-dispatch_conf.patch 1239 RMD160 964bfa44e5753c6e2154d4add40e97e2b54a7589 SHA1 4c5f3b0bc945c7533f72ad2b7e0b702f391537d7 SHA256 a2efa975a7881eb76009aab31e127fbb97e2a531a80cb815f40160855800960f
AUX calculate-builder-2.2.22-kernel_3.patch 1033 RMD160 fcbdfd9d535903dea14b3bc82f15a98180e0de82 SHA1 88619bcb6f0b4017190afda551fcda834a29bbfb SHA256 b58f47845f95bb4efc22e1368c23ee3d8d17b36114c93d7dac4b2e60ef91c50f
DIST calculate-builder-2.2.18.tar.bz2 30995 RMD160 de051bfc8def67c6adc7c08be6610ed022b0e079 SHA1 5271a56e017acaa0e9fe38fd6717d2ef5ecb4ac8 SHA256 0598342020ebb0008ad7a4ac66c42317663ac153c6f74ed313a7b020b2154c1c
DIST calculate-builder-2.2.19.tar.bz2 26464 RMD160 82481411bd5976a3d217dd9a9889b6f90eca1ab2 SHA1 9dc278e441437b31fc6f6a79b41d9c1ec25d5102 SHA256 e87d392255e6de8453594ccde04f0385430bdcd605650e115be7c80ee3a53261
DIST calculate-builder-2.2.20.tar.bz2 26589 RMD160 a313f05452a8d382d35d7b73203cc78d1431c8dc SHA1 887e68cc1c534f848ef0b8a795d6335b8a4ea42b SHA256 77a377f2bf66c408f4e77b1f96dd7484fb4ffad47b026e72ef0c2f19b3d27600
@ -11,7 +12,8 @@ EBUILD calculate-builder-2.2.19.ebuild 590 RMD160 1f89c579d9ebf99dd5213f186ea755
EBUILD calculate-builder-2.2.20.ebuild 590 RMD160 ed36427d69477ee8998e23a9244a838b5920ed48 SHA1 2161372c3ab91218b3c81dd114711826605f79aa SHA256 a90dd01318fa33120651bb5928402de7544c9ae8bd2bbe788ca06366669bebfb
EBUILD calculate-builder-2.2.21.ebuild 590 RMD160 77e8acd113dfe6c24eecf19d99fcb1a4b07e8ac6 SHA1 92380f0ac7886c46f338a604d7ee07f006149d5a SHA256 09126eca71ea6dd007f3f177e8c211dc5e582811b5cfed01c9459ca9a662177b
EBUILD calculate-builder-2.2.22-r1.ebuild 727 RMD160 24da78b86f79ebb1d22511b183e11f46e661b636 SHA1 c31241a65f9fd1bd1668d6703eaa2b1257ebc646 SHA256 7c142796513b7ec88cd1b55bd9f5bbb8f5eef8fdd03542c0ae222644571d0bb3
EBUILD calculate-builder-2.2.22-r2.ebuild 806 RMD160 36bb2e2c92bf9e1f5b744b8d0d01d953588e2898 SHA1 ce6206c45f2e47fdb300a381d7c165bf55179f3b SHA256 e33199093a79278d14e8385fb7591a95ac8a5f93e0470ac8a0cfef09c2e97140
EBUILD calculate-builder-2.2.22.ebuild 590 RMD160 75600caab5c8d5c94f823138e8938aa01a1790f1 SHA1 254d7e611b5afa0bb5e4c267e292202e3eb8a7f6 SHA256 96fba1a295df4911021eeb3d3f3e9f9538a384a57e03e0f4e062e113cd52d75a
EBUILD calculate-builder-2.2.9999.ebuild 555 RMD160 e803b87aed06b8f08e2637e10213a0d81ba3ba0b SHA1 3ed908155f477cfa91155420d4fae903ce8db1da SHA256 fd6326f73e68d91f476498db381f2af62e742e3c461b609a8eb379dc417e1470
MISC ChangeLog 15588 RMD160 3523567d76e86916c6d031c05b5a0f9b0e041dea SHA1 99225e3a8a038fa0c861650f11c3af5dcd7545a7 SHA256 38ddaa66daf00bb6aaabe0612ef7ff4761bcaf348345a1366b703bef9a23f639
MISC ChangeLog 15812 RMD160 79fb22e3be2119e1d69ec9768cdb8d090eecd4f6 SHA1 15ed5203c26a44adba2fcd68a7310142d53f1209 SHA256 929d22355bfc16efac3707279c953d2f905f211476b8b1a7642c00158c80ae73
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0

@ -0,0 +1,33 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
inherit distutils eutils
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND=">=sys-kernel/calckernel-3.4.18
~sys-apps/calculate-install-2.2.22
!<sys-apps/calculate-1.4.0_p20100921
app-cdr/cdrkit
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# dispatch conf execute
epatch "${FILESDIR}/calculate-builder-2.2.22-dispatch_conf.patch"
# support kernel 3
epatch "${FILESDIR}/calculate-builder-2.2.22-kernel_3.patch"
}

@ -0,0 +1,25 @@
commit f7c6a747a1a2a54b34725ce5bb1c577b24a365ef
Author: Mike Hiretsky <mh@calculate.ru>
Date: Tue Aug 30 09:34:54 2011 +0400
Add support 3.0 kernel compiling.
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
index 2b4d512..5835c08 100644
--- pym/cl_fill_builder.py
+++ pym/cl_fill_builder.py
@@ -110,7 +110,13 @@ class fillVars(object, varsShare):
kernelDirs = self.Get('cl_kernel_config_path')
if not access(kernelDirs,R_OK):
return ""
- shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
+ # check first number (3 or other kernel)
+ tupleKernelVer = self.Get('cl_kernel_ver').split('.')
+ if tupleKernelVer and tupleKernelVer[0] == '3':
+ shortVerSearch = re.search("^\d+\.\d+",
+ self.Get('cl_kernel_ver'),re.I)
+ else:
+ shortVerSearch = re.search("^\d+\.\d+.\d+",self.Get('cl_kernel_ver'),re.I)
if shortVerSearch:
shortVer = shortVerSearch.group()
else:

@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*calculate-utilities-2.2.22-r3 (30 Aug 2011)
30 Aug 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
+calculate-utilities-2.2.22-r3.ebuild:
Update for builder
*calculate-utilities-2.2.22-r2 (29 Aug 2011)
29 Aug 2011; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>

@ -38,6 +38,7 @@ EBUILD calculate-utilities-2.2.21-r5.ebuild 877 RMD160 09ce287938acafea4fa6fe56b
EBUILD calculate-utilities-2.2.21.ebuild 862 RMD160 3786826c24e6bfc0fb9e5b413c85e429ae412723 SHA1 8beb4139d5f2828421d57c4ab7ba6e8a2e59d9ef SHA256 530ea787bfee6bd4308bb782b82a42f0e60d02fa692877135f3fe8402c4ba677
EBUILD calculate-utilities-2.2.22-r1.ebuild 865 RMD160 5e07b982463d8770bcfd67bb8892cbeeb521936e SHA1 d25b976542a7748d34d564495862f8e979f88033 SHA256 d3f06aad167e9a4b10163605c050b99fa1303e9534cde13a33dde3efd649a1b7
EBUILD calculate-utilities-2.2.22-r2.ebuild 874 RMD160 e33c33028cb6fb6b0711e1cc16b737de2146f150 SHA1 9b9c9e253283d2abd32c9951dfd00da7363b6818 SHA256 995034e2508108e6aa13e801494576f3d7cc6101edd3566b8c790ebf4c2f402a
EBUILD calculate-utilities-2.2.22-r3.ebuild 874 RMD160 e8db56591a0fe9975a1f23d9bad4daae175648c4 SHA1 17545f6f5c76635b120d18849ab94d89262f4cb0 SHA256 e83f7efe17610fae2ac3245d3b08b49eba0baf015df0c80403ae476f5a3905e4
EBUILD calculate-utilities-2.2.22.ebuild 862 RMD160 e8bb89257a8475f8822893d62cb929753a9bdb20 SHA1 e2a5cd9b07aa215dea3d55cf4a3d7d1c81568403 SHA256 42e6179382cc058bf93136aa8df7b8ea98ec6164980626745b508182926f85f6
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
MISC ChangeLog 21494 RMD160 85600396b0f1f659598808353c01026a31ffadb0 SHA1 23948d28adfaad1631bf705110bdf662ac42b71c SHA256 637f15205ff40ed589fbcf580a47e39259967a0bb925ab11c1084734859f38fe
MISC ChangeLog 21663 RMD160 df13f0b05e4c361b485759b0a3ff48ac727918be SHA1 46bd81da02f7491444a1c7e2b844a085155e3cfa SHA256 1df08ee6f59d4931da241331471753765d6ea032932396d04bf5dbe87bd0a8fe

@ -0,0 +1,37 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
DESCRIPTION="Calculate Utilities meta package"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
SRC_URI=""
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="
cl_assemble
cl_builder
cl_client
cl_desktop
cl_installgui
cl_server
"
RDEPEND="${RDEPEND}
=sys-apps/calculate-install-2.2.22-r1
=sys-apps/calculate-templates-2.2.22-r1
=sys-apps/calculate-lib-2.2.22-r1
=sys-apps/calculate-i18n-2.2.22
cl_assemble? ( =sys-apps/calculate-assemble-2.2.22 )
cl_builder? ( =sys-apps/calculate-builder-2.2.22-r2 )
cl_client? ( =sys-apps/calculate-client-2.2.22 )
cl_desktop? ( =sys-apps/calculate-desktop-2.2.22 )
cl_installgui? ( =app-misc/calculate-install-gui-2.2.22 )
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
"
Loading…
Cancel
Save