Исправление для calculate-builder.

Исправлено создание x86 ISO образов.
atratsevskiy
Mike Khiretskiy 10 years ago
parent e05ff3a37b
commit efa1459204

@ -7,6 +7,7 @@ AUX calculate-lib-2.2.31-file_magic.patch 1098 SHA256 6868701cf25f29cdd5e55808f0
AUX calculate-lib-2.2.31-file_magic2.patch 2019 SHA256 e6759116f78d77c9e34f8c4bdbb030f0c1b6ab9b77680ad4a8f85d3599a7e931 SHA512 2172b84e4b0c2e70e10e5e71beb460354441aba0c07a6c06e6f238b7097cc368c45c129a46685e674a738b2f644bb0b40d55aed011603fffd01c3ee3510851ad WHIRLPOOL bed95676a20fec319456e854f9f8ef082d8ea9757f74f5060c8851b5a4bed3ffd89523dceebceef10892bfbeae5e279cfed240d253c0f55e0f19c32bb64e6801
AUX calculate-lib-2.2.31-fix_ver.patch 539 SHA256 b1bdd3399c770179cf1ff3543334047438fab01c19edd1f8d2a8e9f3ff86707f SHA512 a5b21313189bf70e1b4c2853aff2b7a6385dfb9ed917b4923acbb4158f7ff42732ff5afd5d2b725227f768108c4f2413977fca555bf9fb7c644f89e64f89f292 WHIRLPOOL 0e50ea237076b90f3051200493baa4811f73a67d273e019cefc8e9bccc96b4cce89bf190e8acc431789add578d8a1f170262b74bf0ecd99a5e3978f901c4b20f
AUX calculate-lib-2.2.31-iso_UEFI.patch 1462 SHA256 1e376b916768c40fd523939e737e5c26fff9a0024091cf2a77934a9dd9e4c850 SHA512 a20bd6c9bedbdfe38f66bf403a963c1e066bc306b0bfb8f007616720d913ebd41e7f539df2f77fd4299b1dce37f4578037de2980d322fd8a0928a84ef3223223 WHIRLPOOL 4bb8dfb4905c724f00b620a7302ac3e687944cd2ea5e5d5cacdb98e16beac1b9945bee4ba0bcdbd679be28fa7c6a538dc28fa440cccb1ff74589c594f5f94bc5
AUX calculate-lib-2.2.32-fix_iso_x86.patch 1002 SHA256 cdb67f8274c4ab43e3d8e441793c9ad00d45f6c7c11821114b875da8d65d42b6 SHA512 a7bf65d630667494a2cd75ba85797f8ad4ac88fdec23c757bfb30cd07e3333ef7539a3661c8a18a700982a830662b51b25f0b45aa7d9c4f42cb0a647d11ce937 WHIRLPOOL 0e04fa1d752698b9a3bdbe1301c7abe39464baa09812b3d741bacddbe2fa110098f4d18f0e71ec2b4a2c2824b3ab1f3c8cdf135470f3cee6343351410360e315
AUX calculate-lib-3.1.9-r14.patch 23190 SHA256 28deb3f5b6f818a7be6541b29d77291a0950c0b98c2a4b4de3a37e74ba2042a0 SHA512 4cbdc6b105ff598baf8ec9676cb8d436b3ef67f6c8649984bbf8434611c5503f25ac117e82001897fac7ff5bcc3bb15f3d7bb3167e7c42fa48206f4c84428d97 WHIRLPOOL 819af8d9d82534885e5af621593c8f315e9d38b1fd26c92bc45f8550a2800bfce2c30df3c9accda7e03f77ef1827907b7530d0589a17ff7109f6c029869464e0
AUX calculate-lib-3.2.0_alpha11-r1.patch 5012 SHA256 5be83ffcccc7335a5dbb009a0a6110dd8dd8a9afd03e4a74c0ecaff6306132d1 SHA512 c4478dc2b308c17b3c9e466c011e7caa69a95ef3c676bf3087d37927c2a3067f14d5ab786fc719b7f127b0da1b8e1cb3da5a9b8b53b64332894bd5e820416fd9 WHIRLPOOL fb00c3f9bf5afdd501c13b38f57415cef29aed5079cdf44cfe234d0203bf27f3b44e748cd8d1e335548932750af2faf5bcc328f138c09110d63f473c8ba44395
AUX calculate-lib-3.2.0_alpha12-r1.patch 655 SHA256 451860a2986d7f8b72a5158fa597a5883dd78d0a70e754b3acf8879fb2e38eff SHA512 24e282416c898308d2dd2dd924d0bb2bc325a03cca6d13709a171eb86b9a9bba90958bde8fef1a926c44b8a8647e6486e1570d077cdbe77e775dfec0b8e6ab46 WHIRLPOOL 505e13050a0a0b76abdc98f99f6c80624e56288c8bd62a0e06814b6dc759c5aa21ccefbdfec915f6e1d070c58ea2bc9d8377110df6f13b8145fa781b4b3a08f4
@ -26,6 +27,7 @@ DIST calculate-lib-3.2.0_beta1.tar.bz2 134232 SHA256 d29efc3cbd3a73a2ac6215bd743
EBUILD calculate-lib-2.1.11-r4.ebuild 1063 SHA256 1a8d540badb4f03c485e94d86bed2bb79e9d04cdbffe46ff5e15a0632b07dc11 SHA512 13308a3b09f09cee404ffb16020d81ff6623ea7f78db5d0f7de0ec02dde404c608a31f0bee3eb143e3e1ca2cd2b1563aa6a16d0ea4816e6834b0366ac83172ae WHIRLPOOL 5a4b152ef380654d3ac365f33c0d6b8f20643f7514c3a5658cdc7a1f493e14bcb0c9f5bc532a4947cf7981ad9f0c8d0bdaadd2a2de3d8087fb48e2834fa261bd
EBUILD calculate-lib-2.1.9999.ebuild 555 SHA256 99ff8819b9aa2b46bab952f03b7c5bd8a9b8cb42453747cab6df775c004cd787 SHA512 c6f2c7b60c48e87d7e9f71945f0ed748805828988648fbe72b470e118fa652ad18e1d4798e3b749136f07b30f3c0951be4da191b7aab7ad6e2e2d074799c5f46 WHIRLPOOL 57ff64beb5eff94fab2cd3fd28f1ec84c72fb4aaea9077dce38819ec320d68b3e4c820c05705bdea7afaf751511fbaa03c4fa56f54654d687cd029883054148f
EBUILD calculate-lib-2.2.31-r5.ebuild 1287 SHA256 fab84183bc64b5030db92899ba3414dc4a283d2ab0829c5f3cc4e3a634dc98dd SHA512 36d7a5174efe5b03acf1989fe13a290c5d2143c95c460bf8f2cb46461ada6427bf579802a20b126fea26509579c94fb67b992921bd5284d7d8bbb139840b5d2b WHIRLPOOL aa49524cf4be1e41fc06b5066c67abf3e282f0ba405f88652589e925c727dbb02b6b10bbb06dfa06af4703c6ceaf792bc685f522d3cd8c3d3a55aea422f51723
EBUILD calculate-lib-2.2.32-r1.ebuild 902 SHA256 f9809753dff65a912a3b2a4898e7bcc560e578df0874a3074faa6e829d19acb9 SHA512 75b8f5b131fe7d94505fa7edec7a77187264ab481bceb1db1482c3f313aa62b1968e91c70543d9501538f19bdef24ca404636729d55ff08e6a982dfbb016e459 WHIRLPOOL fc376d9b4a47077509b43f7d8f2cd04655583c3105993aad1632a307663a5eb27a8b28640b9d2f09531ec9578140f6872b97167f827216ee358c00d588a9eb08
EBUILD calculate-lib-2.2.32.ebuild 770 SHA256 889273e755e58ef53871f85e3bcc7df2ef472953db98d757e5d92534273bf11a SHA512 9cd46d5c8a784304c8297460eb48406ee5712e2d11118e9d283895ed0996d897f1b5b32eb7907eba3347a43c6eaf5fae1c50cd98c146f6c6edec06cd31b7861d WHIRLPOOL ee1c5e7d3e8546599f08cd834a316a62e3d9e5eef2209da24dd44676fdcaac9eb02d83be37db5d8275f5dbd7f464f40ba91790b2d6c85ae34a659369eb7162ff
EBUILD calculate-lib-2.2.9999.ebuild 730 SHA256 ce7f2300859687d4f6c50948438bee8a8cb407fd7de56c5c48e0aba846ee6774 SHA512 789179018d82ef7c9a5428de20f529e6071380174d1e417c3a4463859d4b9ceca2a2d4ae078dbe309b976541cfba81a30348a77b6b37089b9597b862d4a45fd8 WHIRLPOOL 380084a24bf396c79fd198e1ad51d2457dcbcc5d3b59420f3794d067949cf7951766a880639bd54399f371ed0961163a03f8ea8a5e2483e512243d57408251be
EBUILD calculate-lib-3.1.9-r14.ebuild 825 SHA256 f3bb03a6dbeba8d2f2821583526e374bf7b828e012df78ba7fd0ea3528a9b62a SHA512 5daa33c8bf7fa75c8886433083c1a623d855791ee8f85a8099fd6c0788886f5fd893183a7dd5ace2f86033de3dfe260bf6d218932fc876b725a29ec10974e9d2 WHIRLPOOL fdc2ccf39697c2f2ad622488df17f716199df777577d07768a25688e980bbf79c137a9ba712bb42e53a8c03e1a21798b01a08112ea8e4fa4b662a924077ca786

@ -0,0 +1,38 @@
# 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 library for Calculate 2"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="2.2"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!<sys-apps/calculate-lib-2.1.8-r1
!=sys-apps/calculate-lib-2.1.9
!=sys-apps/calculate-lib-2.1.10
!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# fix create iso for x86
epatch "${FILESDIR}/calculate-lib-2.2.32-fix_iso_x86.patch"
}

@ -0,0 +1,25 @@
diff --git pym/cl_distr.py pym/cl_distr.py
index cfd628f..2e14a93 100644
--- pym/cl_distr.py
+++ pym/cl_distr.py
@@ -1301,6 +1301,7 @@ class IsoDistributive(Distributive):
"-eltorito-boot %s"%efiImage]
else:
params = ["-b isolinux/isolinux.bin","-no-emul-boot",
+ "-V %s"%self.volid,
"-boot-load-size 4","-boot-info-table","-iso-level 4",
"-hide boot.catalog"]
res,errmes = self.runOsCommand(
diff --git pym/cl_fill.py pym/cl_fill.py
index d559f4b..4930999 100644
--- pym/cl_fill.py
+++ pym/cl_fill.py
@@ -616,7 +616,7 @@ class fillVars(varsShare):
def get_os_scratch(self):
"""Current system is scratch"""
if self.Get('os_root_type') == 'livecd':
- return "on" if isMount('/mnt/scratch/workspace') else "off"
+ return "on" if isMount('/run/builder') else "off"
else:
return "on" if isMount('/mnt/scratch') else "off"

@ -3,6 +3,7 @@ EBUILD calculate-utilities-2.2.31-r32.ebuild 677 SHA256 8967dea72902b4dc30a7f6cf
EBUILD calculate-utilities-2.2.32-r1.ebuild 669 SHA256 ff9bd3d5ded75f80e3299a192a59970929306ca165fc2e0a048fc7dadeff5848 SHA512 03cfeb45032c69743b0a409648d10702a15043b17de60ad0163198d475410ca4d8d22a5d09466a56fef8a555e84bbc32768f3734197cb1d7970432ee7a67d195 WHIRLPOOL f0fb480ed9cb1a93d3743634abac47cbd825a3b470f6275eb5ad8aaaa92cea4ab35b9a29539230929db67f166eb91d72d17ab1b2d95367c23d39ec3f9c320ac2
EBUILD calculate-utilities-2.2.32-r2.ebuild 672 SHA256 914093cff43021bf941bcfc4bb4ea49db2feebd1103e3499c599efaed2d200a7 SHA512 58e01f4be2fca164631f5cc040c0175efd3238aadaeaad4aee4119408ff985d72094f334f499bcaa601c922f846a51d8cb4c501f4e2ee6550ce35f4b37a70a5d WHIRLPOOL 126fdcef7a8340e2eec5a21bfd60d69825b5a71803fb4a946bdb3cf5ef31e4513ba9ab2c10d9aefe7ce53f8eac56503854fdfaa2fb25bd6602700a14a05ef0e6
EBUILD calculate-utilities-2.2.32-r3.ebuild 672 SHA256 df3ecabde3a14863e21f6c12752d163378d8ce79637ff9f431647e6e0af7fbc3 SHA512 b5a19a23ecb66888fdd7b5703de4b54049c45fc5d17f83ad7ac9130b936a62c52e21b05217a06290242028f89a6af1390a6b2d342f73a292fe2c542a4c178015 WHIRLPOOL 4b9776813d76b9fa88b2ca37e0e8a3bfd05ccb542f791dbfdd9c235eaecfbebf6f9bff24978373220a643aa6849e511c907e6d5cab671b690c8cb9dc3d58f828
EBUILD calculate-utilities-2.2.32-r4.ebuild 675 SHA256 766f29ed0e3218cc0d085b7ba62f122f9e23b2177e0cc1ea26da939023d2356c SHA512 d18376d05504bb37edee243101dde64b6dcfb8d1c5988f2c2af4621757a7817c063f230f4b5dec11c4fec7ad1a63594e121eab2634f0703727794064901fb6bd WHIRLPOOL 235009417105b63ce2ce5014a51841a6f19c3bd997f0d1babac179200cb7d1a1695fc2f914522fa057c7314e3c40b2dd2a25924f89675ddcd52ca72fbf4791bc
EBUILD calculate-utilities-2.2.32.ebuild 666 SHA256 c300ca4b789c28d3453944234df8b3925d1ebf251df92a0a6171b992bda51bce SHA512 d95d7500d424777dbabf925c4e161cb19f276ec8b6e5cc49aff97144b904a5d23ad6e9f1aceb76b84bfddff9bc15189d5ed2c188b2598edf8d88c9ce1d63f910 WHIRLPOOL a5d6ce431558ea256eb7e11623af4ace8feaffb04d60794a2810d25e60c37ff7532d46ff5825cd798c131d520590d56732562aff7d26160561f1d59469c99c3b
EBUILD calculate-utilities-2.2.9999.ebuild 831 SHA256 630a2373531bdbda2cac289c82332b3688d57d00b403795b93f68cce36824265 SHA512 cf7553e27cd0772548f746d97ab90093c2aa945e34273aa29df222727684451b6ceadda577e2ac0af943a61f84871286d1505ee3682020437a449542f2750255 WHIRLPOOL c48a8b8d9b64ebd3e32105cfad5b86db16373e3ab90e2fc50c7d2cf8908840ea91ba7a32c537a6406feb1f37d03a21619e0b1e33f1ef11a1047c21a6393d0284
EBUILD calculate-utilities-3.1.9-r34.ebuild 772 SHA256 843d57c3732232408adfdc60e09b53599d5afca31bb9ef303cec5697c45f78cf SHA512 9aefe0888d9357fbef0cf7e7807f48c3e965a15e30170481b793880a42780d2588fb9f2e3407f214c88b18917c705fc12c896e64f606b08f3e4c8487324005e8 WHIRLPOOL 3778616d8139d3011f115518e694a5d6517a8febbda8b1296578170b266a7e1017d45cc07ebd4c87c9108f2eaa4beab802b1015a3f29f9677222fc9e1d98869c

@ -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.32-r1
=sys-apps/calculate-i18n-2.2.32
cl_assemble? ( =sys-apps/calculate-assemble-2.2.32-r1 )
cl_builder? ( =sys-apps/calculate-builder-2.2.32-r2 )
cl_server? ( =sys-apps/calculate-server-2.1.16-r12 )
"
Loading…
Cancel
Save