parent
43a879ceec
commit
037dcdafa7
@ -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.3_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.3_alpha2-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
diff --git install/variables/net.py install/variables/net.py
|
||||
index 6485769..438745d 100644
|
||||
--- install/variables/net.py
|
||||
+++ install/variables/net.py
|
||||
@@ -25,7 +25,8 @@ from calculate.lib.cl_lang import setLocalTranslate
|
||||
setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
|
||||
from calculate.lib.utils.ip import (getInterfaces,getIp,getMask,getMac,
|
||||
- cidrToMask,maskToCidr,getIpNet,isDhcpIp,checkIp,checkMask)
|
||||
+ cidrToMask,maskToCidr,getIpNet,isDhcpIp,checkIp,checkMask,
|
||||
+ getOperState)
|
||||
from calculate.lib.utils.device import lspci
|
||||
from calculate.lib.utils.files import listDirectory,readLinesFile,process
|
||||
from calculate.lib.utils import ip
|
||||
@@ -259,7 +260,10 @@ class VariableOsInstallNetStatus(NetHelper,Variable):
|
||||
elif ipaddr:
|
||||
return ipaddr
|
||||
else:
|
||||
- return "off"
|
||||
+ if getOperState(iface) == 'down':
|
||||
+ return "off"
|
||||
+ else:
|
||||
+ "dhcp"
|
||||
rootDevNfs = self.Get('os_root_dev') == '/dev/nfs'
|
||||
return statusValue(getIp(iface),"on" \
|
||||
if rootDevNfs or isDhcpIp(iface) else "off")
|
||||
@@ -332,7 +336,7 @@ class VariableOsInstallNetCidr(NetHelper,ReadonlyVariable):
|
||||
"""
|
||||
Get CIDR of ip,net (Example: 24)
|
||||
"""
|
||||
- return map(lambda x:maskToCidr(x),
|
||||
+ return map(lambda x:maskToCidr(x) if x else '',
|
||||
self.Get('os_install_net_mask'))
|
||||
|
||||
class VariableOsInstallNetMask(NetHelper,Variable):
|
||||
@ -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.3_alpha2-r1.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.3_alpha2-r2
|
||||
=sys-apps/calculate-i18n-3.1.3_alpha2
|
||||
=sys-apps/calculate-lib-3.1.3_alpha2-r1
|
||||
=sys-apps/calculate-core-3.1.3_alpha2-r1
|
||||
=sys-apps/calculate-update-3.1.3_alpha2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.3_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.3_alpha2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3_alpha2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.3_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue