parent
b7d3f82a22
commit
f32de8953f
@ -0,0 +1,45 @@
|
||||
# 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.3
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=sys-fs/udev-197
|
||||
!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-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
diff --git install/variables/net.py install/variables/net.py
|
||||
index c8801c4..2213077 100644
|
||||
--- install/variables/net.py
|
||||
+++ install/variables/net.py
|
||||
@@ -28,11 +28,13 @@ from calculate.lib.utils.ip import (getInterfaces,getIp,getMask,getMac,
|
||||
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.files import listDirectory,readLinesFile,process,\
|
||||
+ readFile
|
||||
from calculate.lib.utils import ip
|
||||
from calculate.lib.utils.portage import isPkgInstalled
|
||||
from operator import itemgetter
|
||||
from itertools import *
|
||||
+import hashlib
|
||||
|
||||
class NetHelper:
|
||||
"""
|
||||
@@ -95,8 +97,12 @@ class VariableOsInstallNetInterfacesOrig(NetHelper,ReadonlyVariable):
|
||||
'etc/udev/rules.d/70-persistent-net.rules')
|
||||
pathNewUdevNet = path.join(chrootPath,
|
||||
'etc/udev/rules.d/80-net-name-slot.rules')
|
||||
- for foundPath in ifilter(path.exists,(pathOldUdevNet,
|
||||
- pathNewUdevNet)):
|
||||
+ pathOrigUdevNet = path.join(chrootPath,
|
||||
+ 'lib/udev/rules.d/80-net-name-slot.rules')
|
||||
+ if path.exists(pathOldUdevNet) or \
|
||||
+ (path.exists(pathNewUdevNet) and
|
||||
+ hashlib.md5(readFile(pathNewUdevNet)).digest() != \
|
||||
+ hashlib.md5(readFile(pathOrigUdevNet)).digest()):
|
||||
return self.Get('os_install_net_interfaces')
|
||||
def getOrig(x):
|
||||
try:
|
||||
@ -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.3-r1
|
||||
=sys-apps/calculate-i18n-3.1.3
|
||||
=sys-apps/calculate-lib-3.1.3
|
||||
=sys-apps/calculate-core-3.1.3
|
||||
=sys-apps/calculate-update-3.1.3
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.3 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.3 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.3 )
|
||||
"
|
||||
Loading…
Reference in new issue