parent
d7c830bd21
commit
6055d12d17
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${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="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.20
|
||||
~sys-apps/calculate-lib-2.2.20
|
||||
app-portage/layman
|
||||
!app-misc/livecd-tools
|
||||
!minimal? ( sys-boot/grub
|
||||
sys-apps/gptfdisk
|
||||
sys-fs/dosfstools
|
||||
sys-fs/squashfs-tools
|
||||
sys-block/parted )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix detect image fix detect partable
|
||||
# add btrfs support, fix option --iso
|
||||
# fix change partition id, change default fs to ext4
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-many_bugfix.patch"
|
||||
# add net variable for discribe network
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-net_network.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
commit 78c3cb98a34493fd8cd0ae091e5eacb1059cbb54
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Wed Aug 3 13:16:24 2011 +0400
|
||||
|
||||
Add variable for net group (network).
|
||||
|
||||
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
|
||||
index 10d8e5d..b8acbd9 100644
|
||||
--- a/pym/cl_fill_install.py
|
||||
+++ b/pym/cl_fill_install.py
|
||||
@@ -121,6 +121,7 @@ class fillVars(object, glob_attr):
|
||||
mapInterface = {}
|
||||
mapInterface["ip"] = ipaddr
|
||||
mapInterface["cidr"] = str(ip.maskToCidr(mask)) if mask else ""
|
||||
+ mapInterface["network"] = ip.getIpNet(ipaddr,mask=mask)
|
||||
mapInterface["dhcp"] = "on" if dhcp else "off"
|
||||
mapInterface["mac"] = mac
|
||||
mapInterface["name"] = "{vendor} {name}".format(**pciInfo)
|
||||
@@ -1102,6 +1103,10 @@ class fillVars(object, glob_attr):
|
||||
"""Current mask"""
|
||||
return self.getAttributeFromHash('os_install_net_hash','cidr')
|
||||
|
||||
+ def get_os_install_net_network(self):
|
||||
+ """Current network"""
|
||||
+ return self.getAttributeFromHash('os_install_net_hash','network')
|
||||
+
|
||||
def get_os_install_net_mac(self):
|
||||
"""Current mac"""
|
||||
return self.getAttributeFromHash('os_install_net_hash','mac')
|
||||
diff --git a/pym/cl_vars_install.py b/pym/cl_vars_install.py
|
||||
index fdcb803..84c43a6 100644
|
||||
--- a/pym/cl_vars_install.py
|
||||
+++ b/pym/cl_vars_install.py
|
||||
@@ -278,6 +278,9 @@ class Data:
|
||||
# ip for all network interfaces
|
||||
os_install_net_ip = {}
|
||||
|
||||
+ # network for ip
|
||||
+ os_install_net_network = {}
|
||||
+
|
||||
# ip cidr
|
||||
os_install_net_cidr = {}
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=3
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_client
|
||||
cl_desktop
|
||||
cl_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.20-r5
|
||||
=sys-apps/calculate-templates-2.2.20-r1
|
||||
=sys-apps/calculate-lib-2.2.20-r3
|
||||
=sys-apps/calculate-i18n-2.2.20-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.20 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.20 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.20 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.20 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.20 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue