parent
e26c26e141
commit
1110d8ea13
@ -0,0 +1,53 @@
|
||||
# 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 pxe"
|
||||
|
||||
DEPEND="~sys-apps/calculate-templates-2.2.27
|
||||
~sys-apps/calculate-lib-2.2.27
|
||||
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}"
|
||||
|
||||
# fix activity,boot nfs,install handbook, fix ssh
|
||||
epatch "${FILESDIR}/calculate-install-2.2.27-r3.patch"
|
||||
|
||||
# fix rsync copy
|
||||
epatch "${FILESDIR}/calculate-install-2.2.27-fix_rsync.patch"
|
||||
|
||||
# fix net setup
|
||||
epatch "${FILESDIR}/calculate-install-2.2.27-net_setup.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
diff --git a/pym/cl_install_cmd.py b/pym/cl_install_cmd.py
|
||||
index ae58080..48c2216 100644
|
||||
--- a/pym/cl_install_cmd.py
|
||||
+++ b/pym/cl_install_cmd.py
|
||||
@@ -308,6 +308,7 @@ class install_cmd(share_cmd):
|
||||
valuename=_("frame buffer resolution"),
|
||||
example="1024x768")
|
||||
if values.ip:
|
||||
+ self.clVars.Set('os_install_net_settings','',True)
|
||||
for ipaddr in values.ip:
|
||||
if not re.match("^(\w+:)?%s$"%iputils.IP_ADDR_NET,ipaddr):
|
||||
self.optobj.error(self.errorWithExample.format(
|
||||
@@ -316,6 +317,7 @@ class install_cmd(share_cmd):
|
||||
value=ipaddr,
|
||||
example="eth0:192.168.0.21/16"))
|
||||
if not values.dns is None:
|
||||
+ self.clVars.Set('os_install_net_settings','',True)
|
||||
if not re.match("(^{0}(,{0})*|)$".format(iputils.IP_ADDR),
|
||||
values.dns):
|
||||
self.optobj.error(self.errorWithExample.format(
|
||||
@@ -324,6 +326,7 @@ class install_cmd(share_cmd):
|
||||
value=values.dns,
|
||||
example="8.8.8.8"))
|
||||
if values.route:
|
||||
+ self.clVars.Set('os_install_net_settings','',True)
|
||||
for route in values.route:
|
||||
if not re.match("^({net}|default):(({ipaddr})?"
|
||||
"(:\w+(:{ipaddr})?)?)?$".format(
|
||||
@ -0,0 +1,36 @@
|
||||
# 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.27-r6
|
||||
=sys-apps/calculate-templates-2.2.27-r9
|
||||
=sys-apps/calculate-lib-2.2.27-r3
|
||||
=sys-apps/calculate-i18n-2.2.27-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.27-r2 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.27-r4 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.27-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.27 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.27-r2 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.15-r4 )
|
||||
"
|
||||
Loading…
Reference in new issue