parent
e7317e0160
commit
44d4b84085
@ -1,7 +1,9 @@
|
||||
AUX calculate-install-2.2.18-fix_unit_size.patch 1300 RMD160 071651b55f9c3d75184f94a5b7fc09a0b0477393 SHA1 95c2e4879da53679746640145bf4050ff8af278c SHA256 5f677fb05e9e9bee8bc84a6360da681f1d8d17d0a8945f431967d23edbd4dcb4
|
||||
AUX calculate-install-2.2.18-to_2.2.19_rc1.patch 2145 RMD160 ff0242bbf53e10e1cd073f414660560085601816 SHA1 53fce5bfbf312fa59ef7b8284060f452c0dc83b6 SHA256 a1ff97026b5464a37879d72830f3b5ef8f93a08239ab5024c68d4509c83fecfe
|
||||
DIST calculate-install-2.2.18.tar.bz2 75850 RMD160 56b1058d1977957cc6ceb8322a049af4dbb8f0cc SHA1 4e990cf5bd6310942b54995293f1f7ea82726aa9 SHA256 2a1b9c3fa93a958f19f05af51f80adf25f5ee0867452fac0304ec721de19cd97
|
||||
EBUILD calculate-install-2.2.18-r1.ebuild 896 RMD160 ee093622c27d416e091dbe7d79f4937dec59b9ef SHA1 725ebcabb3fc63fde3a6e804d3912caacd121fa7 SHA256 9d08644a337cafe7a5744e4ffdf7f8ff549c785bf03acd33349c441aedb72de2
|
||||
EBUILD calculate-install-2.2.18-r2.ebuild 932 RMD160 58d8b3049aff0a442c250e99c3ebe7d5ed986059 SHA1 cfffed7c2a5918a20ba4a0d776032b281a9d73a1 SHA256 8f8eba36071b0dfe73074a01b8f94c7026c6180d09a3085c9815f368e01b46c9
|
||||
EBUILD calculate-install-2.2.18.ebuild 718 RMD160 6036a151e5e5f44dc88f05943483889aac3db500 SHA1 733eb52ed024192f39a93961b2af8b4f4d8b9ed7 SHA256 a10787adc974dd82ca0272b461ad9b593cd441f821fb1696b57d2b97e3f4297f
|
||||
EBUILD calculate-install-2.2.9999.ebuild 595 RMD160 8f9b9a14fed39ded9c2a9d9343aa4e892d620172 SHA1 09aff28bdaa486868e2caddc7911732a905336ee SHA256 534e6c6e465177e269ce7beed96dab08a124878591088c1bf38095e855ca1180
|
||||
MISC ChangeLog 22740 RMD160 9c41b93974e4acbf44e1b82144cb84c427102007 SHA1 a69b3b6b5f15635d300a5e1eed8b7fb16c2668a6 SHA256 5c13696d6aa8bd886d01a624d6ccd2a6a58697caa233e50abc0e107428409aed
|
||||
MISC ChangeLog 22959 RMD160 9057f821041647ba81f9644bffea4c9142b15e01 SHA1 36c18cd31ab180e7a701a57caa2c546550fb5a12 SHA256 63a59422acae6f33d818dc38a8e6ed2862afc7ff8785e71796f6a2881e801056
|
||||
MISC metadata.xml 310 RMD160 769e4f17a9354da6b168b72a5d65d978f65bf6dd SHA1 83aaae376052d69c7327e880cf028ebc0dea608b SHA256 c29d3efc676d8308872920db5223c78469db86ac236b5d45c3ee98ceb8fca846
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
# 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 program of installation Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.18
|
||||
~sys-apps/calculate-lib-2.2.18
|
||||
app-portage/layman
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# change unit of parition size and fix bug legecy grub installaion
|
||||
epatch "${FILESDIR}/calculate-install-2.2.18-to_2.2.19_rc1.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,44 @@
|
||||
diff --git pym/cl_fill_install.py pym/cl_fill_install.py
|
||||
index fb9434e..1b2e27b 100644
|
||||
--- pym/cl_fill_install.py
|
||||
+++ pym/cl_fill_install.py
|
||||
@@ -25,7 +25,7 @@ from os import readlink,access,R_OK
|
||||
from cl_utils import isMount,typeFile,getTupleVersion,pathJoin,isFstabMount,\
|
||||
listDirectory, getAvailableX11Drivers, getUUIDDict, \
|
||||
isPkgInstalled, process, checkUtils, readLinesFile, \
|
||||
- lspci
|
||||
+ lspci, getPartitionSize
|
||||
from cl_distr import DistributiveRepository,PartitionDistributive
|
||||
from cl_fill import clLocale
|
||||
from operator import itemgetter
|
||||
@@ -381,7 +381,7 @@ class fillVars(object, glob_attr):
|
||||
disk_hash[partition]['part'] = parts[4]
|
||||
if len(parts)>5 and "swap" in parts[5]:
|
||||
disk_hash[partition]['format'] = 'swap'
|
||||
- disk_hash[partition]['size'] = parts[3]
|
||||
+ disk_hash[partition]['size'] = getPartitionSize(partition)
|
||||
# fill format, name and uuid
|
||||
execStr = self.getProgPath('/sbin/blkid')
|
||||
res = self._runos(execStr)
|
||||
diff --git pym/cl_install.py pym/cl_install.py
|
||||
index 97404c5..f2cf84c 100644
|
||||
--- pym/cl_install.py
|
||||
+++ pym/cl_install.py
|
||||
@@ -1279,7 +1279,7 @@ class cl_install(color_print, SignalInterrupt):
|
||||
if filter(lambda x: x != '/', usedMP):
|
||||
if self.clVars.Get('os_install_scratch') == "on":
|
||||
self.printERROR(
|
||||
- _("Builder mode is not support multipartition"))
|
||||
+ _("Builder mode is not support multipartition install"))
|
||||
return False
|
||||
|
||||
# check specified devices
|
||||
@@ -1735,7 +1735,7 @@ class cl_install(color_print, SignalInterrupt):
|
||||
mbrDisk = self.clVars.Get('os_install_mbr')
|
||||
mbrDiskNum = self.varSelect(
|
||||
"os_device_map",where="os_device_dev",eq=mbrDisk)
|
||||
- if not mbrDiskNum:
|
||||
+ if not mbrDiskNum and mbrDiskNum != 0:
|
||||
raise DistributiveError(_("Cann't determine mbr disk"))
|
||||
for line in ("root (hd%s)"%bootDisk,
|
||||
"setup (hd%d)"%mbrDiskNum,
|
||||
@ -0,0 +1,32 @@
|
||||
# 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 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/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add part size function and fix work with python2.6
|
||||
epatch "${FILESDIR}/calculate-lib-2.2.18-to_2.2.19_rc1.patch"
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
AUX calculate-templates-2.2.18-fix_corrupting_calculateenv.patch 628 RMD160 494cf84e27c85b9a51c41089de70b73cc1da714f SHA1 db81ba9bd4922d2b02dda0ed17adcd0f762b9b70 SHA256 e0fe5f803f77e476742dd0ac3d208fa63835e690774538a0deb79e84ff9b3686
|
||||
DIST calculate-templates-2.2.18.tar.bz2 233661 RMD160 c8e42c3ed8860193286ff8eaeddcd1c75bb1ef0b SHA1 f197621e5777c16aca9b892d30ede172eee50522 SHA256 d3d236c7e0760db3ad9ea79f0fed9d9e5f97d69acabbae3bbc9c9d2e62a50984
|
||||
EBUILD calculate-templates-2.2.18-r1.ebuild 728 RMD160 e245cf9fb50cd08618902672ba94dbb1c8d7ba38 SHA1 9d5cdf47f57ce8196b0e7895f11970fbbe448596 SHA256 25accec86c1148518d7412366376250dfa3e566782c8c850c52baf1a7916d64a
|
||||
EBUILD calculate-templates-2.2.18.ebuild 581 RMD160 7069b5e31c10ade1bc04c3e1f4ff769ae0f80712 SHA1 d024d43f3c1496321bab619518c300d69385952c SHA256 c30ceff00fc644d3e968050f1cd7ceeffcf916d8d8fc5db723db13b0666ab500
|
||||
EBUILD calculate-templates-2.2.9999.ebuild 572 RMD160 14e53f7c05efbb563b793b1025669cbe79d0838c SHA1 226d287ce0a00609ed6c871321abf5000565227e SHA256 5df16332077472571e2d4aae47e958d1e6efe3a8d694b61053778f75a537142f
|
||||
MISC ChangeLog 26038 RMD160 81e818cc05f7cc5c9d2b28ab3117612eb445f0db SHA1 1747dafb0cacc13db733af06fda224cc78151b9c SHA256 eca9262c1594e7279a20434305acdb5bf3a848eb6d9a156348ee3342bd7c7488
|
||||
MISC ChangeLog 26277 RMD160 e7d827eba2e2155226a3f3fd383a06f9013d3073 SHA1 140899d3928621bbcc638db8c94eb864de0b920a SHA256 92f40ad334293f2866d11b56f7ef0e146da46bb5470cfd9d81ff88c9430a47b5
|
||||
MISC metadata.xml 338 RMD160 4a1a51881bdf09b961217d2056114ca4ccb8b4d2 SHA1 5fcb2724427f9ac5dda07abb5c829c24e6db9ae6 SHA256 175d9ae86b71b291a519414e816b05290d0e4be74726cc8d5449a500c51a3b2d
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Templates for calculate utilities 2.2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-2.2.18"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# bug fix patch
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.18-fix_corrupting_calculateenv.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git install/1merge/00-calculate-install/calculate2.env install/1merge/00-calculate-install/calculate2.env
|
||||
index cead32f..6866fd0 100644
|
||||
--- install/1merge/00-calculate-install/calculate2.env
|
||||
+++ install/1merge/00-calculate-install/calculate2.env
|
||||
@@ -1,4 +1,8 @@
|
||||
-# Calculate format=samba path=/etc/calculate
|
||||
+# Calculate format=samba path=/etc/calculate cl_chroot_status==off||ac_install_system==up autoupdate
|
||||
+
|
||||
+#?ac_install_system!=up&&exists(/etc/calculate/calculate2.env,root)!=#
|
||||
+#-load(empty,/etc/calculate/calculate2.env,root)-#
|
||||
+#ac_install_system#
|
||||
|
||||
[install]
|
||||
os_install_net_settings = #-os_install_net_conf-#
|
||||
@ -1,4 +1,5 @@
|
||||
EBUILD calculate-utilities-2.2.18-r1.ebuild 837 RMD160 6d67af30f0ef3ca5a5be4a8f42024475105b3614 SHA1 512d8584bf37d465375aeddac2025651c2128d6b SHA256 6f23d0c91d558e4a2ab68f9a2cff12cfcae68c0b72e89c906326bd366cc88862
|
||||
EBUILD calculate-utilities-2.2.18-r2.ebuild 840 RMD160 a7cbfca6f5e3dbd6a2de54c3784a9a8c32a9bd67 SHA1 5e840d33d0773eaebbae9746c5ea9f10b459b744 SHA256 6d72f0e416f26e1765e95231ff7705ebe81cddb5d12d4245fbc095a4db1c0eed
|
||||
EBUILD calculate-utilities-2.2.18.ebuild 829 RMD160 e73b8763bd13098473327959bc435ff52d470836 SHA1 b394d0126e846d4780a77f2f89429f6bf8734a27 SHA256 550f341dc60ca43b23100152a58c30178cb1c88456d007bb1439fb4cb949fcd1
|
||||
EBUILD calculate-utilities-2.2.9999.ebuild 840 RMD160 0c7324a9ed480118ac19f62b162c9ee62c25f964 SHA1 7dadab1430ed147334ed7e9b4fcc86dc99e25d56 SHA256 f3ee28f9f765e7302c83eb4a15a09bdf066f09e6b40e34f6d52157a946df5e66
|
||||
MISC ChangeLog 15520 RMD160 4fd913a3b0c46a64984403142ad6b6bc52660e73 SHA1 4a31ac486e6b040e62f0ba1a07a059d767b5b7ec SHA256 8a2f7f174ddc71d728fa92d4cb77c5ca3107082a2e419ea62452656d7479aa8e
|
||||
MISC ChangeLog 15703 RMD160 e066d1351267ef2cffa05762039b9799e028f839 SHA1 9d5a8c88b0a9d049f88feb5992d6ad50654e3c19 SHA256 f4611c020f204b9694753d192896d2328c274265418cbe153e5ffe5812ca6859
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
# 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.18-r2
|
||||
=sys-apps/calculate-templates-2.2.18-r1
|
||||
=sys-apps/calculate-lib-2.2.18-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.18 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.18 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.18 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.18 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.18 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r4 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue