Update builder

atratsevskiy
parent 5735841c38
commit ecb5b5dd35

@ -1,7 +1,7 @@
AUX calculate-builder-2.2.30-fix_builder.patch 1216 SHA256 6d40f758e3fef56568026debf7c8092dc2e210dde60474d6abb4b1f0e775944f SHA512 5c07f1257acbf54d4be4c901ab06943bc80b382ab73b47310fb42553f588012b3f199e3a3691d419ef60c7f356892ca7e8475ea7cd45d8e1dc9ded82e80f793f WHIRLPOOL f6e69afa09794949cfd2bef9c2762bc8695f7fcd0310f14261a8e145d24ec3157e96b918ba00379972b0e74652a9d0a9a956f054bf3f1ab7e43cb81e94122711
AUX calculate-builder-2.2.30-r6.patch 9261 SHA256 ba5d8eae88c268536b0886f0018a3ed0c1f0faba2631325924d3780ee014301e SHA512 530c4f65af5da106e20e12d6deb81b344224870e098c871738a4a24c729c64023774445ae1aa4505b343c33805c03e9b873e903b64d3a872225ecaeb1a9025da WHIRLPOOL 72863773345b07f23d5d5c367e0f7e3e03941c498c872d8fc9b2cd119de859b45850bdd92731f014c783f63376a18dccb1d7ecf9b0f88278772e68efcb4c3e87
AUX calculate-builder-2.2.31-fix_version.patch 490 SHA256 0cb649bec5a26beb75cae7faf5963a778ae37ea43270fbda92c0fe04e6c5db38 SHA512 420649875895790bc7c73dfb0ef295f4675ce13bfc41aa3c43b63e484daf4c642546a17c008a3c42efb55fef105d216f28035788a2bba9cf0305748112df9207 WHIRLPOOL 44cc2a54e306560a736e46826ba7e2db1bd4e449755e641192a1c6ce86791d93187691528e7f28a8138fe48cd41b1452d8bb76916e39dd60663f2fa21b44571e
AUX calculate-builder-2.2.31-grub2.patch 785 SHA256 1c67842caaa4abbbba17a69ba9cb84d6b847e3d4aa2b561adcab30b0042d3994 SHA512 f4f0f22488eecca434f82e4aaf73c86169d022e95ed0dddfe2dc8ce5c41989e9839cbe6b815c5e77a80175399dd228523aaca01252686a97ef3b37256840fdd5 WHIRLPOOL de8781e9ff03193a6f3ec4e99f94fabc7158fa25d67e0196a4d614423020b75d86b48b68003a933310e81cb2eebd28f08e8f77a1b17daf0f98042a62c4903220
AUX calculate-builder-2.2.31-grub2.patch 786 SHA256 93c0275149e2d569e5a49ed821a99d5869033e4885858ad69e3f88fd6815a099 SHA512 df971c5d61ada0127643f9cc9e57ba3774f53a2739ec81f37e954de37a9012d256fd1bd88bac68343a768ce5a742571d37eb330b560e861d4f2c4d0bbdddd8d4 WHIRLPOOL 893c09863b2615f73fa3936d397bf1ffbc25195a004691e8b52c3b9602a62698635f8f243a1a5ab78f733e385b233aaec8096aa736a5351d1b63e38e5a1bb7c9
AUX calculate-builder-2.2.31-r1.patch 887 SHA256 79a309fdc30cad7a2aa1278b744a902f17b25f1e04674f33ef39fb51aecc47a3 SHA512 fe165dadacd71c78cc4139e8e387157c0b4ae8c8a8f33db990434e6151f7c085ee691d7905a74d0ce5842ac02826788a4e7b4a5ede9a9aaf44d1e389fe008126 WHIRLPOOL cae9396e89e58b2d28850ed584a61c91aa27db1057d1044c84e5cba3915a14820fd01e8e74b2a395a03b85b5ff4b2cf4169e89f5e3ab9e4712ceebbdefc92f1c
AUX calculate-builder-2.2.31-r3.patch 2182 SHA256 15c0a8080f76ce7b6631487dc52004606b31b8ae0e94f2e23d3d4b0e12d1b2a7 SHA512 183a2e6264f0464284942308cf46ae321d4060aa3d0e914efda4487129c8fd43f25a209a3227a45aeb81ba8b8a03b12f93b3ef0be1663d496511b893c83293a1 WHIRLPOOL 6ad7a3f35f60e115771745c2345eda4f57af0378fbac0b5337e81cf1ac819625582278322e33ac7a5cd2ccd03d217c5c4ffc5b2b3a4ccfbb9cb90196df9efae0
AUX calculate-builder-2.2.31-r4.patch 2756 SHA256 8ba7ff17f887f205ed403bca4d824d22e0d810d33fe2be5cbe83828f080043de SHA512 8719191f27590c53275b1758be1b0c690576e3c3260bda15cafeca998ff02003c552f23240745a43ba49a6d498f73ad38e6ceba6605c94bb54dffde7cda6a939 WHIRLPOOL 620d1bac4119d7deaf1251253143127a5847a64e6e66ff22ca44b444a583d5867fb5ed0f354374a6ade65e2bdb467ef22123e22486d9c09f19144d48a1e8736f
@ -13,6 +13,7 @@ EBUILD calculate-builder-2.2.31-r3.ebuild 800 SHA256 8beec00ed6a9922512d69f2d52d
EBUILD calculate-builder-2.2.31-r4.ebuild 994 SHA256 959708bc255f77a1eabd4159ad9328dd14a6bff534a0cffe4a77c96124a83a03 SHA512 1ee9e58bdf53dd451368dc7f7cfb9b3d05c4b59fccd0f1dc0c93b5ccd48c86fe56de8d5550b54b3394c4f25f35d21afe11bc562c1b3423f7a0c7535861918a84 WHIRLPOOL 1b1a362277482e41531759e2248b7199c02f48718b604cf970f52d433306bd8e1a49280f80daba2a71de0c3785258247b70c740cdcf848974c5280073dab210f
EBUILD calculate-builder-2.2.31-r5.ebuild 1020 SHA256 b3a8c73e92c830809dacc803402bc4647da436e2fc910b65d79627cebf26811d SHA512 9c5ccdbe054793e92c5ffc4d4c09931da7fe12d5bef7feb0a442132e583e6ff538986a151d51c6fc66959fd10df4bd30d2eff0006abc9b6268d8b1e4f8be9b8d WHIRLPOOL 6a5171f254b71f72e0283a9d2d6ad08babf4ff791931d8626c6834d7fea5527f9b5485d8232dfcd6358850e5e752661b1d4633145eb1edd0252bd734cbd73039
EBUILD calculate-builder-2.2.31-r6.ebuild 1103 SHA256 ef4e96ab2a52e8738ec50ac020bcd7a9e9008b907c55414ba9848146ad7c11bf SHA512 6b6deacea11e57287a4752ce37503cd210049f550cd82fe3f8edb18663af31c841f7ff02680f85f19f17813dc317d79d56c6559261a30bbac8c0e4065759e39a WHIRLPOOL 8398a776caa0922b645c7cbed2da3af05d2d48029efdabaaa080e35d743683ee595e341c124743f394883c6302788e5b4c22b78d5f88365d59a95fa7b595302f
EBUILD calculate-builder-2.2.31-r7.ebuild 1103 SHA256 ef4e96ab2a52e8738ec50ac020bcd7a9e9008b907c55414ba9848146ad7c11bf SHA512 6b6deacea11e57287a4752ce37503cd210049f550cd82fe3f8edb18663af31c841f7ff02680f85f19f17813dc317d79d56c6559261a30bbac8c0e4065759e39a WHIRLPOOL 8398a776caa0922b645c7cbed2da3af05d2d48029efdabaaa080e35d743683ee595e341c124743f394883c6302788e5b4c22b78d5f88365d59a95fa7b595302f
EBUILD calculate-builder-2.2.31.ebuild 668 SHA256 d5d3e22b4c1ff9b201f3da282a590e8a61691ddb35db87d5796ccfbd3e543a8a SHA512 19100ac3601e502e5efdeed7304829d04b110918ccb103bc00c594a8991c9df51f718ef9a9ec61ab8f41449a430b814679a658805058281b91b1776f6b07eb3e WHIRLPOOL e1cc47f8e841b34f54962826c544cdec3bed00b3d6b9c8227a3168e2842f8100870c025410d753ce343d8253da2b75b2ead98598b09d15d4eef6c2403de81895
EBUILD calculate-builder-2.2.9999.ebuild 645 SHA256 12bd65856844de72d88588937b6a65b39b7dec7eaba06d028e8c5a78ef6b28a5 SHA512 fc6396dad3a92a5a746f4ed32caf092ede65898e4822e52ad541faaa44467a4f81daf6f261af8eb20017c6155923e2011433e4b15071d7098392c901ae3a5078 WHIRLPOOL fd0151c3ce9fa98c5ca63470e561487c063293727006da10446c0a2ac2c65305042a5359bc0163840c1dd4502d67641453dddaf5cded552dacf6c5c97ccc7402
MISC ChangeLog 20663 SHA256 f05f75b85860fc850514bd6bcaa1671c6de2ead417071f28ccbec647528f58a2 SHA512 2bcbfd0212333bbf8bfd1fc4de894ee50b71b0671e4769fd40a1aee4fbab0260919b447f109e3b02047835c6e0eb93c04ea6ce135836144d078c09f0c5615d95 WHIRLPOOL dbf2791d84acf8567520bfd90462650ca9c9c0da7a3515e9e5695c3a419cfd043e235d8d681704f33a0c99272e93563de0fc6426f9476f894a48d52a21409462

@ -0,0 +1,40 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 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-lib-2.2.31
!<sys-apps/calculate-1.4.0_p20100921
>=app-cdr/cdrtools-3.01_alpha13
>=sys-boot/grub-2.00-r3
>=sys-boot/syslinux-4.06
sys-fs/squashfs-tools"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# remove depricated templates,UEFI hybrid
epatch "${FILESDIR}/calculate-builder-2.2.31-r4.patch"
# fix version of calculate builder to 2.2.32 for using iso grub templates
epatch "${FILESDIR}/calculate-builder-2.2.31-fix_version.patch"
# fix update grub-2.00
epatch "${FILESDIR}/calculate-builder-2.2.31-grub2.patch"
}

@ -1,20 +1,17 @@
commit c539398bc22240aa4efb5391127a3d5e569c0321
Author: Mike Hiretsky <mh@calculate.ru>
Date: Wed Mar 20 17:07:12 2013 +0400
Fix update kernel entry for grub2
diff --git pym/cl_kernel.py pym/cl_kernel.py
index 456efad..1ab977c 100644
index 456efad..4efd797 100644
--- pym/cl_kernel.py
+++ pym/cl_kernel.py
@@ -398,7 +398,8 @@ class cl_kernel(color_print):
@@ -398,8 +398,10 @@ class cl_kernel(color_print):
' calculate=video:%s'%x11video,y,1)
# if has grub2
- if filter(lambda x:x.startswith("grub-1.99"),
- listDirectory('/var/db/pkg/sys-boot')):
+ if filter(lambda x:x.startswith("grub-1.99") or \
+ x.startswith("grub-2"),
listDirectory('/var/db/pkg/sys-boot')):
+ listDirectory('/var/db/pkg/sys-boot')) and \
+ os.environ["EBUILD_PHASE"] == '':
grubInstall = process('/usr/sbin/cl-core','--method','core_setup',
'--pkg-name','grub',
'--no-progress',stderr=None)

@ -5,6 +5,7 @@ EBUILD calculate-utilities-2.2.31-r3.ebuild 668 SHA256 790efd70c869cab7fe15b4453
EBUILD calculate-utilities-2.2.31-r4.ebuild 671 SHA256 225851c711ca3ae4b2aeb4f94a19704fb136a86be712804d31ca123de6854292 SHA512 631ce928661bf6be02b05669b28263097697927750e467bdbac6806f79e375ee53a21319f4c7f1d708d5d708ef416db9042e436ec884beaa2b8fb3977c2d587e WHIRLPOOL e4da7c49f8a37d32ad0ece9f104b4e9f4ff830070327a132e1dcfdab80a3ff06f07c8a58444212fe975902c2b6d706703acfab6dee4582f361bf566d32b192c7
EBUILD calculate-utilities-2.2.31-r5.ebuild 671 SHA256 3d3d1cd32e4dd7b676db59a79204156034950009d2fc600922d3f566fc1a07fc SHA512 8f47137864a8280c96f367f7db3b0cdc29df217b1997d382920b4415c5bd39f765231ba8e33c0e4622b76178e02690018c266f54b228dae5d336bbcbe0c1854c WHIRLPOOL d633309dd9a1b3ffa3e6600fbe95a4369e86b870ece8991e6839ed53c9867c76a6166dceedb54f26427b5f58d4eede135ed50f24ba2f1139f58a2e1f7b221fe3
EBUILD calculate-utilities-2.2.31-r6.ebuild 674 SHA256 9bae496a7aa2a28263aa3ef267c0b24606cacc58aa4057ca2d8faf48ae855018 SHA512 31f02b784ac282fe23238efc4bfc19b3010eafcdb0565394e220782da0ee91d96e84de0d2d5f184077ec6bfe818f6e0a14b059a4811c59633a006ac7b1cd29f5 WHIRLPOOL 8cb4302976ed9e7be60ef5fdfe8b9cc9f036a8611ff99b3c87cdd5d545e2a6c8a17095b8409b8b11783f73cc2c2cad5f2d8ff133438c96e830930deea8799a82
EBUILD calculate-utilities-2.2.31-r7.ebuild 674 SHA256 b22660287b4b4bd7a499387b579225905202c2a1e53978f4a03e2d64a9fdca0d SHA512 3de97a5a8610b32d115ec04043a31b338b1bf4931e102020b55c97c0a9a85c89af20c6e93895f0364e80bf1b6724da755c4afcd27cc006fbc085a8bf03edd563 WHIRLPOOL 233697bc0900ba0d5327df054eebf8a65b6492bc4f0c530f87679e5921027f9b32f58c85440e53b2cfdfe33286bed9783bc3c8da952e7372bc008ed0923ffe40
EBUILD calculate-utilities-2.2.31.ebuild 665 SHA256 ae87f3614957179ca66f4e1f322dcb280ec89d408bf43a1528c5387b928deed9 SHA512 864f85ae7b8d3a5b648e00f8fdd2b31ce553b7be097cac09d8f11d8d9ca59e091501b90a163e25f2bd123f0585bf1158b1ec99447d03e2b433a6d72369bcc1b3 WHIRLPOOL c4bb4621eea6a14778066ff39e53c4a7e2fc576d29a1291a716edb2a1ae50358b9510d9ad2785bbd2d83e82a10dfe1ff1d567fdfa448c8a416dd1fbbe7a2f4dd
EBUILD calculate-utilities-2.2.9999.ebuild 842 SHA256 56d97b7d2ce11d23b25d9036b4e2ee196b547ce1d11b0cc349a8205515b66bf1 SHA512 fc7802b92ade52210fa7381b55c48638da6d9adee6d2f03f18d6bdd0050756089b3ca8de944f4e865517554523b40737abe9f22587ecae74079eec563f80868b WHIRLPOOL f1382f0629a8dae37aaecf40cb8cbc3682bde3b43e92c9c6a84cda75897dc5d5de043233fb7a3f929749520b05fe3af94187c7a3ccdae4e252e83699d871f225
EBUILD calculate-utilities-3.1.1-r3.ebuild 761 SHA256 70e0fb66ae382253295eeb211bd9ead7cd0e9cb0308362f6d2eacf6e2d382c0f SHA512 2ac5b5accbd60460defc2d51c035834842c9088829e1876fa60c854f718406f41f20cd6351990d396328e7d56caa66b0751c597b357948a4db4ab6bc56f0ffec WHIRLPOOL ac28164c7b3811c9dc03418d11cb0f79c6fa71bf969f93d06f7dbf2435cf898f3f16da80032bc112785e0e7e71fa6ac8f8a1bb7e6731f4561603d7b5590b619d

@ -0,0 +1,30 @@
# Copyright 1999-2012 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_server
"
RDEPEND="${RDEPEND}
!sys-apps/calculate-templates
!<sys-apps/calculate-install-3.0.0_alpha1
=sys-apps/calculate-lib-2.2.31-r1
=sys-apps/calculate-i18n-2.2.31
cl_assemble? ( =sys-apps/calculate-assemble-2.2.31-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.31-r7 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r7 )
"
Loading…
Cancel
Save