parent
72756af020
commit
8bc04faf77
@ -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_beta2
|
||||
!<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_beta2-r11.patch"
|
||||
}
|
||||
@ -0,0 +1,157 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index 1ec60b3..dc36f4c 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -142,6 +142,10 @@ start() {
|
||||
touch /* /bin/* /sbin/*
|
||||
udevadm trigger --action="add" --subsystem-match=net
|
||||
fi
|
||||
+ if [[ $roottype != "livecd" ]]
|
||||
+ then
|
||||
+ /usr/bin/eix-checkout &>/dev/null &
|
||||
+ fi
|
||||
|
||||
/sbin/rc-update --update
|
||||
return 0
|
||||
diff --git install/cl_distr.py install/cl_distr.py
|
||||
index 9dcdcb3..2dd8c6c 100644
|
||||
--- install/cl_distr.py
|
||||
+++ install/cl_distr.py
|
||||
@@ -132,7 +132,7 @@ class Distributive(object):
|
||||
elif "Squashfs filesystem" in ftype:
|
||||
return SquashDistributive(filename)
|
||||
elif path.isdir(filename):
|
||||
- if path.exists(path.join(filename,"livecd")):
|
||||
+ if path.isfile(path.join(filename,"livecd")):
|
||||
return IsoDistributive(filename)
|
||||
else:
|
||||
return DirectoryDistributive(filename)
|
||||
diff --git install/cl_install.py install/cl_install.py
|
||||
index c42e0a7..daf7042 100644
|
||||
--- install/cl_install.py
|
||||
+++ install/cl_install.py
|
||||
@@ -20,6 +20,8 @@ import sys
|
||||
import time
|
||||
from os import path
|
||||
from StringIO import StringIO
|
||||
+from random import choice
|
||||
+import string
|
||||
from time import sleep
|
||||
from subprocess import PIPE,STDOUT
|
||||
from shutil import copy2
|
||||
@@ -601,6 +603,7 @@ class Install(color_print):
|
||||
self.cleanInitrd()
|
||||
self.endTask("")
|
||||
|
||||
+ self.remountNTFS()
|
||||
# join templates
|
||||
self.startTask(_("Updating the configuration"),progress=True)
|
||||
self.applyTemplates(targetDistr.getDirectory(),
|
||||
@@ -661,6 +664,7 @@ class Install(color_print):
|
||||
setupType).capitalize(),progress=True)
|
||||
else:
|
||||
self.startTask(_("System configuration"),progress=True)
|
||||
+ refreshLVM()
|
||||
res = self.applyTemplatesStartup()
|
||||
self.endTask()
|
||||
if setupType and self.clVars.Get('cl_setup') == 'network':
|
||||
@@ -784,3 +788,39 @@ class Install(color_print):
|
||||
self.prepareBoot(self.targetDistr)
|
||||
self.endTask()
|
||||
return True
|
||||
+
|
||||
+ def rndString(self):
|
||||
+ """Get random string with len 8 char"""
|
||||
+ return "".join([choice(string.ascii_letters+string.digits)
|
||||
+ for i in xrange(0,8)])
|
||||
+
|
||||
+ def _getFreeDirectory(self,directory):
|
||||
+ """
|
||||
+ Get free directory name
|
||||
+ """
|
||||
+ newDirectoryName = directory
|
||||
+ while path.exists(newDirectoryName):
|
||||
+ newDirectoryName = "%s.%s"%(directory,self.rndString())
|
||||
+ return newDirectoryName
|
||||
+
|
||||
+ def remountNTFS(self):
|
||||
+ """
|
||||
+ Remount NTFS partitions
|
||||
+ """
|
||||
+ for disk in self.clVars.Select('os_disk_dev',
|
||||
+ where='os_disk_format',like='ntfs'):
|
||||
+ mountDir = self._getFreeDirectory('/var/lib/calculate/mount.test')
|
||||
+ try:
|
||||
+ os.mkdir(mountDir)
|
||||
+ except:
|
||||
+ continue
|
||||
+ if process('/bin/mount',disk,mountDir).success():
|
||||
+ for i in (0.2,0.5,1,2):
|
||||
+ if process('/bin/umount',mountDir).success():
|
||||
+ break
|
||||
+ else:
|
||||
+ self.printWARNING(_("Unable umount %s")%mountDir)
|
||||
+ try:
|
||||
+ os.rmdir(mountDir)
|
||||
+ except:
|
||||
+ self.printWARNING(_("Unable remove directory %s")%mountDir)
|
||||
diff --git install/variables/X11.py install/variables/X11.py
|
||||
index 22b99f2..ea1d29f 100644
|
||||
--- install/variables/X11.py
|
||||
+++ install/variables/X11.py
|
||||
@@ -207,6 +207,8 @@ class VariableOsInstallX11Composite(VideoVariable):
|
||||
|
||||
if self.Get('os_install_x11_video_drv') in defaultCompositeOn:
|
||||
defaultComposite = "on"
|
||||
+ elif self.Get('hr_virtual') == 'vmware':
|
||||
+ defaultComposite = "on"
|
||||
else:
|
||||
defaultComposite = "off"
|
||||
if self.Get('os_install_x11_video_drv') == self.Get('os_x11_video_drv'):
|
||||
diff --git install/variables/action.py install/variables/action.py
|
||||
index d704e74..5416223 100644
|
||||
--- install/variables/action.py
|
||||
+++ install/variables/action.py
|
||||
@@ -32,7 +32,8 @@ class VariableAcInstallMerge(ActionVariable):
|
||||
if cl_action in ("system","merge") and \
|
||||
self.Get('os_install_root_type') != 'flash' and \
|
||||
self.Get('os_install_pxe') == 'off' and \
|
||||
- self.Get('cl_live') == 'off':
|
||||
+ self.Get('cl_live') == 'off' or \
|
||||
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
|
||||
return "on"
|
||||
return "off"
|
||||
|
||||
@@ -47,7 +48,8 @@ class VariableAcInstallLive(ActionVariable):
|
||||
def action(self,cl_action):
|
||||
if cl_action in ("system","merge") and \
|
||||
self.Get('os_install_root_type') != 'flash' and \
|
||||
- self.Get('os_install_pxe') == 'off':
|
||||
+ self.Get('os_install_pxe') == 'off' or \
|
||||
+ cl_action in ("sync",) and self.Get('cl_merge_pkg'):
|
||||
return "on"
|
||||
return "off"
|
||||
|
||||
@@ -97,6 +99,7 @@ class VariableAcInstallUnmerge(ActionVariable):
|
||||
Action variable which has value "up" on prerm ebuild phase
|
||||
"""
|
||||
def action(self,cl_action):
|
||||
- if cl_action == "merge" and self.Get('cl_ebuild_phase') == 'prerm':
|
||||
+ if cl_action == "merge" and \
|
||||
+ self.Get('cl_ebuild_phase') in ('prerm','postrm'):
|
||||
return "on"
|
||||
return "off"
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 9ca8a8b..ccbdc17 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -1470,7 +1470,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
# search /boot device or / device, by priority /boot,/
|
||||
if bootDevice:
|
||||
return bootDevice
|
||||
- return self.Select('os_device_dev',where='os_device_type',eq='hdd')
|
||||
+ return [self.Select('os_device_dev',where='os_device_type',eq='hdd',
|
||||
+ limit=1)]
|
||||
|
||||
def choice(self):
|
||||
deviceParentMap = dict(self.ZipVars('os_device_dev','os_device_name'))
|
||||
@ -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_beta2-r11
|
||||
=sys-apps/calculate-i18n-3.1.1_beta2-r2
|
||||
=sys-apps/calculate-lib-3.1.1_beta2-r6
|
||||
=sys-apps/calculate-core-3.1.1_beta2-r8
|
||||
=sys-apps/calculate-update-3.1.1_beta2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_beta2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_beta2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_beta2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_beta2 )
|
||||
"
|
||||
Loading…
Reference in new issue