parent
e41c1963bf
commit
0a7c2d18ca
@ -0,0 +1,48 @@
|
|||||||
|
# Copyright 1999-2012 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/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-lib-3.0.0_beta2
|
||||||
|
!<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}"
|
||||||
|
|
||||||
|
# catch expected error fix detect default mbr
|
||||||
|
epatch "${FILESDIR}/calculate-install-3.0.0_beta2-r5.patch"
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
einfo "For install wsdl for calculate-install perform:"
|
||||||
|
einfo " cl-core --append-variable cl_wsdl=calculate-install"
|
||||||
|
einfo " cl-core --append-variable cl_merges=calculate-install"
|
||||||
|
}
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
commit 983964d61d224534244569e565afe94aa6c179b0
|
||||||
|
Author: Mike Hiretsky <mh@calculate.ru>
|
||||||
|
Date: Wed Jun 27 17:57:39 2012 +0400
|
||||||
|
|
||||||
|
Fix print expected error in cl-configure
|
||||||
|
|
||||||
|
Fix detect default mbr for hdd installation
|
||||||
|
|
||||||
|
diff --git a/install/cl_install.py b/install/cl_install.py
|
||||||
|
index 04dfbe5..ec71e82 100644
|
||||||
|
--- a/install/cl_install.py
|
||||||
|
+++ b/install/cl_install.py
|
||||||
|
@@ -830,6 +830,13 @@ class Install(color_print):
|
||||||
|
pass
|
||||||
|
if not setupType:
|
||||||
|
self.installDesktopClient()
|
||||||
|
+ except (MigrationError,
|
||||||
|
+ TemplatesError,
|
||||||
|
+ InstallError,
|
||||||
|
+ AutopartitionError,
|
||||||
|
+ DistributiveError) as e:
|
||||||
|
+ error = str(e)
|
||||||
|
+ self.printERROR(error)
|
||||||
|
except (BaseException),e:
|
||||||
|
error = ""
|
||||||
|
for i in apply(traceback.format_exception, sys.exc_info()):
|
||||||
|
@@ -841,6 +848,13 @@ class Install(color_print):
|
||||||
|
self.clVars.close()
|
||||||
|
if target:
|
||||||
|
target.close()
|
||||||
|
+ except (MigrationError,
|
||||||
|
+ TemplatesError,
|
||||||
|
+ InstallError,
|
||||||
|
+ AutopartitionError,
|
||||||
|
+ DistributiveError) as e:
|
||||||
|
+ error = str(e)
|
||||||
|
+ self.printERROR(error)
|
||||||
|
except (BaseException),e:
|
||||||
|
error = ""
|
||||||
|
for i in apply(traceback.format_exception, sys.exc_info()):
|
||||||
|
diff --git a/install/variables/disk.py b/install/variables/disk.py
|
||||||
|
index 22989c5..a2e8078 100644
|
||||||
|
--- a/install/variables/disk.py
|
||||||
|
+++ b/install/variables/disk.py
|
||||||
|
@@ -1423,9 +1423,7 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||||
|
# search /boot device or / device, by priority /boot,/
|
||||||
|
if bootDevice:
|
||||||
|
return bootDevice
|
||||||
|
- if self.Get('os_device_dev'):
|
||||||
|
- return [self.Get('os_device_dev')[0]]
|
||||||
|
- return []
|
||||||
|
+ return self.Select('os_device_dev',where='os_device_type',eq='hdd')
|
||||||
|
|
||||||
|
def choice(self):
|
||||||
|
deviceParentMap = dict(self.ZipVars('os_device_dev','os_device_name'))
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
# 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_console"
|
||||||
|
|
||||||
|
RDEPEND="${RDEPEND}
|
||||||
|
=sys-apps/calculate-install-3.0.0_beta2-r4
|
||||||
|
=sys-apps/calculate-i18n-3.0.0_beta2
|
||||||
|
=sys-apps/calculate-lib-3.0.0_beta2
|
||||||
|
=sys-apps/calculate-core-3.0.0_beta2
|
||||||
|
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta2 )
|
||||||
|
cl_console? ( =sys-apps/calculate-console-3.0.0_beta2 )
|
||||||
|
"
|
||||||
|
|
||||||
Loading…
Reference in new issue