parent
525f9970d4
commit
c330fee90c
@ -1,7 +1,6 @@
|
||||
AUX calculate-core-3.1.1_beta3-r1.patch 1289 SHA256 e2ea222c9bfcffdbfb30bf447514570d0fa3cf76f4dc2614e119aa3f10ff6fb4 SHA512 f9b618b6e941dfa6240f9346234f3810af0044c32666e0e107f29dfffd87ce4f2b1c3ee65c74ef961d4f4fe50528b0e1b432933a7c97afcfbb998fdf56882a5b WHIRLPOOL 1735cc1b11f1cfccc7c250d02621aa12e192fa906e53f15629acaed54e89cb50887ff1367fbb35e0bfb06fd73d82614f696b68e8904bcfbdb053524eca15ef40
|
||||
DIST calculate-core-3.1.1_beta3.tar.bz2 83360 SHA256 ee27bf80f5d89556c122e2718c3f707a06fc49e138d5aa17df24339e2634fa76 SHA512 8707e3220c4b5362944207d44feb7d0b007c19481a4e9522bf7b7f4284d1d63571fbc7578a8fe45f54ccb0202effac5455a7c5b58d33622836afa8d7cfe36ca7 WHIRLPOOL 3046d336fa708b00a2912565d9a41e117e5bd87921e13b10d666af0f542b74189559325cdbbbdff4b58c8894bfc717729af9384c11fd2722a051ca348fb09648
|
||||
EBUILD calculate-core-3.1.1_beta3-r1.ebuild 1219 SHA256 50ab94aba191fba70c7c0bcff81d683c98c2e61a34f4ff17736a2025a1f1ddd0 SHA512 d67776973bc63b7328acda77a2f3da4927b88742ea032131676d730e93c5ea6a55bf2c2e9f3e9cd55b30f36cb847c85dc0b870540851b4c523a203da4593c67d WHIRLPOOL 6de35fd21ddf8bb31cfdc226da97273369a1336d66fab2f9596c87adc25f441d4c232cd031e1c88142551f325a5b77f8cbb4db02f60de1fc0823f6d797be5cfd
|
||||
EBUILD calculate-core-3.1.1_beta3.ebuild 1079 SHA256 9db72e3460d70f9c4c03226b16350c401e33fe81c9fc173eaf293a32c65904d8 SHA512 2c62694b63f7ae4bd5ba759376129debc85b0e11268d7017ae0ee0547d9b5e8fe822cec039b4c78472de23b24647fb226688d59717d4ba080ca504c035a1092b WHIRLPOOL 86a0ee9ddd29fc42d0014a4c973ae4e74c8573056de5b934699a652d9348463c66ec2de36d3501c1fd3869b05eedc96688142db4ca177d0af7effa91d273a049
|
||||
EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
|
||||
MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922
|
||||
MISC metadata.xml 285 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5 SHA512 337b11b6e13958ce6550ab955e1fbc0061b919db3c9cac6964d323c4ab1ce3782e9dd473a1924bcf03b5058452aae212feeeb01e5e6c7844bb88675380c87162 WHIRLPOOL b117f08043f61eb0e88d3881d54ce29e4dd565129442554ee7a30f498b7140d6008abf57be22342a6df8eaefbdc351356dd813788ae25b6274ce6f6fdef30d0f
|
||||
|
@ -1,42 +0,0 @@
|
||||
# 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/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.1_beta3
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
@ -1,23 +0,0 @@
|
||||
# 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/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-3.1.1_beta3"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
@ -1,11 +1,8 @@
|
||||
AUX calculate-install-3.1.0_rootsize.patch 706 SHA256 ca1e8220dafcc5942406644a6bd99a08f54fb94c19b13feeb73c85d2991ea787 SHA512 de2fc9472d4677de1beb903ed70030b1f625842dc6c5b214977b30f2e98e06983f0972634ea57268a1f070f0fe1bde10b661ec7a7750d2c1a31e4a883894ed67 WHIRLPOOL 97e4a373ac13e73bcba520182f1a4fd959cea2757ce1bf0fce1809bd487c03adb67ac288c4f0dd159fa375ca4156fe7ac17e1326cecfcc54c50d789bc881da2e
|
||||
AUX calculate-install-3.1.1_beta3-r1.patch 2618 SHA256 f8c52af114e0bdd44e1930d4822d23cf85c01e03308a0a4695eef042b92907ae SHA512 875e42341a670a77ddcdb9d266fcdc4b71cdaa2e798340d018cda5353cd15123080a79e87463da13fc18fcabd38ed56ad532043f6931aec9b33030e6d9cbdd1f WHIRLPOOL 5b2c5229e11d07a19c37a6596e42683d236d1e33f22b09b6da8db7a75095dc9654f9505b4a5e223882c105c77f4a6b18f9f6fe4dcd475c38e38b0f12462d5fc4
|
||||
AUX calculate-install-3.1.1_beta3-r2.patch 2978 SHA256 011577ee13f4144f60c75591958f4aa85e67e75fde425dcaa98f191bee7ed654 SHA512 e3ab2e6a09d2bef6dd07f39a63cf4cb2b7c8197a585591e5de638bfe3140d44f13e6526f1ec7090b5bcaeadad9eeacf0d2637d3bee0e5486ae13d1db7a9cff9b WHIRLPOOL 41cb390786281b17fdba5afcb04f3ce450d11b8c913a5698077422fc7fe55565b31e2950107a3770c55fbb8722396e1d2cfae74b06c958d044c8b5f97804693f
|
||||
DIST calculate-install-3.1.1_beta3.tar.bz2 74351 SHA256 17fddc728727d1324fe1ece634d6987f55f54df7c520dded6ee20a631a9860c3 SHA512 524c25aec9e8b330e0fd9e4e0e3ce8a97994795dae336b391bc325a9ebd82c436886015d049ce515b7b2adb0c3dcded1370c45150e3c7d2d2acbb077b2ba4838 WHIRLPOOL 2b5633e4997625b31a3907dfca0caf5ba47e5f0522cb1a9fe4f22412b6abda7f6160d19ee290a277d494f0c60d36222fa792514cf4b27b72a9b4d914122f081c
|
||||
EBUILD calculate-install-2.2.9999.ebuild 685 SHA256 5b6fe8d4f7c8109f9adcdfa6546bb253c9f04e1d10dc6b1aa6b1087c2486d096 SHA512 0b74f8bb94ba419869cc209963bc8f79cd98e4ffdd95b400f3e6c80d32da23ed314c3ec6bca6163f32e64c6dbdb1503a23e68d49c8f011c762a77b03bc94a326 WHIRLPOOL 5c9e1acddd461064c67e152429e98651298c54c8e4a7f5c9c419cda4045b6a1b5221a5bbfc3c95dd03b48f157d40e1a37e8f7e42e9aacff4575851150cbdb9a4
|
||||
EBUILD calculate-install-3.1.1_beta3-r1.ebuild 1055 SHA256 dd7a2efdca4ecf0acd30dfa7363b269262cd8d5029ece6da76f54c8a2bea2c02 SHA512 ac611c6398d72c7811a86635543f822f2cf17ef0e8b90132abac9ba456081ac02bb311097193be468be91f9a4c1605486d89594395f8e225ce3f9c9db628d902 WHIRLPOOL db7776fd27088016ff58754e6f18a39da54f309d57f7bdb66c85dfb66608ff822d2ba9cfa971c2b9f7e09fdbb2f668e19b027ae08c888f1c55a6c6f10fd7182a
|
||||
EBUILD calculate-install-3.1.1_beta3-r2.ebuild 1055 SHA256 a9c434ddd6da2e452e5e3d728d4b2e4d7511862a6f15d2dd2d8cd94c21c15dcd SHA512 f8ba42b6cbaf863ffd7eb55610447693108f45fe7a6bcb7ed98b205b86d8fdc724ddb5c410d37475432fe1c0d17183f71764b3bf224ac38d12141a535b02754d WHIRLPOOL 58169f6227ae3423e62328b9b90054f8a5ff26fff1c788719168dfebd640336cbb344abfc730c8a73580507141d88b116c713ef76ca08253bf9e6314761a5f6b
|
||||
EBUILD calculate-install-3.1.1_beta3.ebuild 912 SHA256 ac6ee4778b1be57c82a8305feecccd68ec9ccfc0535a01dbe7d38e117873c29a SHA512 c4ab5c9fb6a4f0ac2793166ec7db188e2052f367f4112ff97d87ac8ece333a514b55109b5e501c271b701d882cba6772c2f068e63f3c25049d86bb2b57e62f82 WHIRLPOOL 759f83ba7eb61ec904a5d707cadcb08d91f6c2c0106b7ddcbf5fce2f801bbc8e7c845f713ec27077b11a95a9082607fb267a56c66f8cb417e538cf64efb31950
|
||||
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
|
||||
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3
|
||||
MISC metadata.xml 464 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d SHA512 dd79935fabf9b629ee0913eae0cec88b0d6e46fc58e9b430e07e2a60f2e0ce66e8c257a3da33e17663a778d2a18b3a12f96f18cbc6e009f071788ed9353e4a29 WHIRLPOOL 8f72663b95c36637d15d40e0c56e5fd9e7e06e073993d202d788df1704bb979e794cde966428675f158786e273ba5677151d15d8e40a4715f769172a8ebf3e1e
|
||||
|
@ -1,44 +0,0 @@
|
||||
# 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/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
sys-apps/iproute2[-minimal]
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.1_beta3-r1.patch"
|
||||
}
|
@ -1,37 +0,0 @@
|
||||
# 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/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_beta3
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
sys-apps/iproute2[-minimal]
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
>=sys-apps/util-linux-2.19.1
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )
|
||||
pxe? ( sys-apps/calculate-server
|
||||
net-ftp/tftp-hpa
|
||||
net-misc/dhcp
|
||||
net-fs/nfs-utils )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
@ -1,59 +0,0 @@
|
||||
diff --git install/cl_install.py install/cl_install.py
|
||||
index 65d4972..6cd63c5 100644
|
||||
--- install/cl_install.py
|
||||
+++ install/cl_install.py
|
||||
@@ -809,13 +809,13 @@ class Install(color_print):
|
||||
"""
|
||||
for disk in self.clVars.Select('os_disk_dev',
|
||||
where='os_disk_format',like='ntfs'):
|
||||
- mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
|
||||
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.ntfs')
|
||||
try:
|
||||
os.mkdir(mountDir)
|
||||
except:
|
||||
continue
|
||||
if process('/bin/mount',disk,mountDir).success():
|
||||
- for i in (0.2,0.5,1,2):
|
||||
+ for i in (0.2,0.5,1,2,4,5):
|
||||
if process('/bin/umount',mountDir).success():
|
||||
break
|
||||
else:
|
||||
diff --git install/fs_manager.py install/fs_manager.py
|
||||
index f3f7a62..8583f86 100644
|
||||
--- install/fs_manager.py
|
||||
+++ install/fs_manager.py
|
||||
@@ -59,7 +59,6 @@ class FileSystemManager:
|
||||
'msdos': '83',
|
||||
'type':['hdd','usb-hdd']},
|
||||
'btrfs': {'defaultopt': defaultOpt,
|
||||
- 'format': '/sbin/mkfs.btrfs',
|
||||
'formatparam': '{labelparam} {device}',
|
||||
'gpt': '0700',
|
||||
'label': '-L {labelname}',
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 43cba4d..1682186 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -1016,7 +1016,7 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
|
||||
(self.Get('os_disk_mount'))))
|
||||
unavailFS = set(self.Select('os_format_type',
|
||||
where='os_format_use',
|
||||
- eq="off"))
|
||||
+ eq="no"))
|
||||
fixNtfs = self.fixNtfs
|
||||
for dev,mp,fs,isformat in info:
|
||||
# should format if change fs or partition is root, but non flash
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 6a70936..3bcc35e 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -108,7 +108,8 @@ class VariableOsFormatUse(ReadonlyVariable):
|
||||
|
||||
def get(self):
|
||||
return map(lambda x:"yes"
|
||||
- if path.exists(FileSystemManager.supportFS[x]["format"])
|
||||
+ if "format" in FileSystemManager.supportFS[x] and \
|
||||
+ path.exists(FileSystemManager.supportFS[x]["format"])
|
||||
else "no", self.Get('os_format_type'))
|
||||
|
||||
class VariableClMigrateRootPwd(UserHelper,Variable):
|
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.1_beta3-r1
|
||||
=sys-apps/calculate-i18n-3.1.1_beta3-r1
|
||||
=sys-apps/calculate-lib-3.1.1_beta3
|
||||
=sys-apps/calculate-core-3.1.1_beta3-r1
|
||||
=sys-apps/calculate-update-3.1.1_beta3
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_beta3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta3 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta3 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_beta3 )
|
||||
"
|
@ -1,26 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.1_beta3
|
||||
=sys-apps/calculate-i18n-3.1.1_beta3
|
||||
=sys-apps/calculate-lib-3.1.1_beta3
|
||||
=sys-apps/calculate-core-3.1.1_beta3
|
||||
=sys-apps/calculate-update-3.1.1_beta3
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_beta3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta3 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta3 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_beta3 )
|
||||
"
|
Loading…
Reference in new issue