parent
d130f5d1ff
commit
525f9970d4
@ -0,0 +1,44 @@
|
||||
# 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-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
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..884d8b7 100644
|
||||
--- install/fs_manager.py
|
||||
+++ install/fs_manager.py
|
||||
@@ -59,7 +59,7 @@ class FileSystemManager:
|
||||
'msdos': '83',
|
||||
'type':['hdd','usb-hdd']},
|
||||
'btrfs': {'defaultopt': defaultOpt,
|
||||
- 'format': '/sbin/mkfs.btrfs',
|
||||
+ '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..04d6455 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -106,10 +106,16 @@ class VariableOsFormatUse(ReadonlyVariable):
|
||||
'type': "bool",
|
||||
'value': "off"}
|
||||
|
||||
+ def checkFunc(self,fs):
|
||||
+ if fs == "btrfs" and self.Get('os_root_type') == 'livecd':
|
||||
+ return "no"
|
||||
+ if "format" in FileSystemManager.supportFS[fs] and \
|
||||
+ path.exists(FileSystemManager.supportFS[fs]["format"]):
|
||||
+ return "yes"
|
||||
+ return "no"
|
||||
+
|
||||
def get(self):
|
||||
- return map(lambda x:"yes"
|
||||
- if path.exists(FileSystemManager.supportFS[x]["format"])
|
||||
- else "no", self.Get('os_format_type'))
|
||||
+ return map(self.checkFunc, self.Get('os_format_type'))
|
||||
|
||||
class VariableClMigrateRootPwd(UserHelper,Variable):
|
||||
"""
|
||||
@ -0,0 +1,26 @@
|
||||
# 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-r2
|
||||
=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 )
|
||||
"
|
||||
Loading…
Reference in new issue