parent
691a2722b2
commit
130ab12ad7
@ -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=""
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.1_alpha2
|
||||
!<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_alpha2-r6.patch"
|
||||
}
|
||||
@ -0,0 +1,179 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index c2d6505..1ec60b3 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -136,7 +136,8 @@ start() {
|
||||
|
||||
# reinit net.* services
|
||||
local roottype=`variable_value main.os_root_type`
|
||||
- if [[ $roottype == "livecd" ]]
|
||||
+ local rootdev=`variable_value main.os_root_dev`
|
||||
+ if [[ $roottype == "livecd" ]] && [[ $rootdev == "/dev/nfs" ]]
|
||||
then
|
||||
touch /* /bin/* /sbin/*
|
||||
udevadm trigger --action="add" --subsystem-match=net
|
||||
diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py
|
||||
index a007be4..d4c117d 100644
|
||||
--- install/cl_wsdl_install.py
|
||||
+++ install/cl_wsdl_install.py
|
||||
@@ -192,7 +192,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Installation'),title=__('Flash install'),
|
||||
- image='drive-removable-media-usb-pendrive,media-flash',
|
||||
+ image='drive-removable-media-usb-pendrive,'
|
||||
+ 'drive-removable-media-usb,media-flash',
|
||||
gui=True, rights=['install'])
|
||||
def install_flash ( self, sid, info):
|
||||
"""
|
||||
@@ -220,7 +221,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Installation'),title=__('PXE install'),
|
||||
- image='network-server',command='cl-install-pxe',
|
||||
+ image='network-server,preferences-desktop-remote-desktop',
|
||||
+ command='cl-install-pxe',
|
||||
gui=True, rights=['installpxe'])
|
||||
def install_pxe ( self, sid, info):
|
||||
"""
|
||||
@@ -251,7 +253,8 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('Network'),
|
||||
- image='network-idle,preferences-system-network',
|
||||
+ image='gnome-network-properties,'
|
||||
+ 'network-idle,preferences-system-network',
|
||||
command="cl-setup-network",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_network ( self, sid, info):
|
||||
@@ -281,7 +284,7 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('Video'),
|
||||
- image='gnome-multimedia,video-display',
|
||||
+ image='video-display,gnome-multimedia',
|
||||
command="cl-setup-video",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_video ( self, sid, info):
|
||||
@@ -369,7 +372,7 @@ class Wsdl:
|
||||
|
||||
@rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
@core_method(category=__('Configuration'),title=__('System'),
|
||||
- image='system,computer',command="cl-setup-system",
|
||||
+ image='system-run,system,computer',command="cl-setup-system",
|
||||
gui=True, rights=['setup'])
|
||||
def setup_system ( self, sid, info):
|
||||
"""
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 2fd5e5c..9ca8a8b 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -621,7 +621,7 @@ class VariableOsLocationData(LocationHelper,TableVariable):
|
||||
self.label = _("Locations")
|
||||
|
||||
def set(self,value):
|
||||
- return sorted(value,key=lambda x:x[0])
|
||||
+ return sorted(value,key=lambda x:x and x[0])
|
||||
|
||||
class VariableOsLocationSource(LocationHelper,DeviceHelper,Variable):
|
||||
"""
|
||||
diff --git install/variables/distr.py install/variables/distr.py
|
||||
index 71423b2..0e0693c 100644
|
||||
--- install/variables/distr.py
|
||||
+++ install/variables/distr.py
|
||||
@@ -121,18 +121,21 @@ class DistroRepository(Linux):
|
||||
if not d:
|
||||
return False
|
||||
# check filter conditions
|
||||
- if system and systemByName(d['name']) != system:
|
||||
+ if system and systemByName(d['os_linux_shortname']) != system:
|
||||
return False
|
||||
- if not "name" in d or not "ver" in d:
|
||||
+ if not "os_linux_shortname" in d or not "os_linux_ver" in d:
|
||||
return False
|
||||
- if shortname and d['name'].lower() != shortname.lower():
|
||||
+ if shortname and \
|
||||
+ d['os_linux_shortname'].lower() != shortname.lower():
|
||||
return False
|
||||
- if march and d['march'] != march:
|
||||
+ if march and d['os_arch_machine'] != march:
|
||||
return False
|
||||
- if version and not verCmp(getTupleVersion(d['ver']), version):
|
||||
+ if version and \
|
||||
+ not verCmp(getTupleVersion(d['os_linux_ver']), version):
|
||||
return False
|
||||
- if build and "build" in d and (not d['build'].isdigit() or
|
||||
- not buildCmp(int(d['build']),build)):
|
||||
+ if build and "os_linux_build" in d and \
|
||||
+ (not d['os_linux_build'].isdigit() or
|
||||
+ not buildCmp(int(d['os_linux_build']),build)):
|
||||
return False
|
||||
return True
|
||||
|
||||
@@ -167,11 +170,11 @@ class DistroRepository(Linux):
|
||||
|
||||
def sortdistrfunc(self,x,y):
|
||||
"""Func of comparing two distributive"""
|
||||
- ver1, ver2 = x[1].get('ver',""), y[1].get('ver',"")
|
||||
+ ver1, ver2 = x[1].get('os_linux_ver',""), y[1].get('os_linux_ver',"")
|
||||
if ver1 and ver2 and ver1 != "0" and ver2 != "0" and ver1 != ver2:
|
||||
return cmpVersion(ver1,ver2)
|
||||
- build1 = getTupleVersion(x[1].get('build',""))
|
||||
- build2 = getTupleVersion(y[1].get('build',""))
|
||||
+ build1 = getTupleVersion(x[1].get('os_linux_build',""))
|
||||
+ build2 = getTupleVersion(y[1].get('os_linux_build',""))
|
||||
if build1 != build2:
|
||||
return cmp(build1,build2)
|
||||
else:
|
||||
diff --git install/variables/locale.py install/variables/locale.py
|
||||
index 456d909..209727f 100644
|
||||
--- install/variables/locale.py
|
||||
+++ install/variables/locale.py
|
||||
@@ -232,8 +232,10 @@ class VariableOsInstallClockTimezone(LocaleVariable):
|
||||
lang = self.Get('os_install_locale_lang').split('_')[1]
|
||||
nativeTZ = map(lambda x:x.encode('utf-8'),
|
||||
country_timezones[lang])
|
||||
- source = nativeTZ + ["---"] + filter(lambda x:not x in nativeTZ,
|
||||
- source)
|
||||
+ source = nativeTZ + ["---"] + \
|
||||
+ sorted(filter(lambda x:not x in nativeTZ,source),
|
||||
+ key=lambda x:timezone(x)._utcoffset.total_seconds(),
|
||||
+ reverse=True)
|
||||
except (KeyError,IndexError) as e:
|
||||
pass
|
||||
return list(self.generateComments(source))
|
||||
diff --git install/variables/net.py install/variables/net.py
|
||||
index 50f74c1..1dc16bb 100644
|
||||
--- install/variables/net.py
|
||||
+++ install/variables/net.py
|
||||
@@ -347,6 +347,9 @@ class VariableOsInstallNetRouteData(NetHelper,TableVariable):
|
||||
'os_install_net_route_src']
|
||||
routing = True
|
||||
|
||||
+ def humanReadable(self):
|
||||
+ return self.Get()
|
||||
+
|
||||
def init(self):
|
||||
self.label = _("Routing")
|
||||
self.help = \
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 130439a..5e0dd96 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -25,6 +25,7 @@ from calculate.lib.utils.files import (readFile,getProgPath,process,
|
||||
readLinesFile)
|
||||
from calculate.lib.utils.common import getPasswdUsers,getUserGroups,getGroups
|
||||
from calculate.lib.utils.portage import isPkgInstalled
|
||||
+from calculate.lib.utils.device import getUdevDeviceInfo
|
||||
from crypt import crypt
|
||||
from calculate.lib.encrypt import encrypt
|
||||
import calculate.lib.cl_template as cl_template
|
||||
@@ -371,6 +372,8 @@ class VariableOsInstallDevFrom(Variable):
|
||||
"""
|
||||
If device in calculate3.env dev_from not exists set ''
|
||||
"""
|
||||
+ if value:
|
||||
+ value = getUdevDeviceInfo(name=value).get('DEVNAME',value)
|
||||
if value in self.Get('os_disk_dev'):
|
||||
return value
|
||||
else:
|
||||
@ -0,0 +1,35 @@
|
||||
# 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 library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS=""
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.1_alpha2-r17.patch"
|
||||
}
|
||||
@ -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=""
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.1_alpha2-r6
|
||||
=sys-apps/calculate-i18n-3.1.1_alpha2-r1
|
||||
=sys-apps/calculate-lib-3.1.1_alpha2-r17
|
||||
=sys-apps/calculate-core-3.1.1_alpha2-r6
|
||||
=sys-apps/calculate-update-3.1.1_alpha2-r3
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.1_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.1_alpha2-r2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.1_alpha2-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.1_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue