parent
728ef95255
commit
b0be6cb447
@ -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="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.2.0_alpha12
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=virtual/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 )"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.2.0_alpha12-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 8ccc646..e65eac1 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -110,7 +110,10 @@ class VariableOsDeviceDev(ReadonlyVariable,DeviceHelper):
|
||||
def get(self):
|
||||
"""Get device /dev name"""
|
||||
if self.master is None:
|
||||
- self.master,slave = pty.openpty()
|
||||
+ try:
|
||||
+ self.master, slave = pty.openpty()
|
||||
+ except OSError:
|
||||
+ raise VariableError('Failed to create PTY')
|
||||
udevAdm = getProgPath('/sbin/udevadm')
|
||||
self.monitor = Popen([udevAdm,"monitor","--kernel",
|
||||
"--subsystem-match=block"],stdout=slave,
|
||||
diff --git install/variables/distr.py install/variables/distr.py
|
||||
index c564c66..2e0d32c 100644
|
||||
--- install/variables/distr.py
|
||||
+++ install/variables/distr.py
|
||||
@@ -448,7 +448,9 @@ class VariableClImagePath(ReadonlyVariable):
|
||||
livedistr = ['/mnt/livecd']
|
||||
# standard livecd
|
||||
else:
|
||||
- livedistr = ['/mnt/cdrom']
|
||||
+ livedistr = ['/run/initramfs/squashfs',
|
||||
+ '/run/initramfs/live',
|
||||
+ '/mnt/cdrom']
|
||||
else:
|
||||
livedistr = []
|
||||
# search all partition for source installation distributive
|
||||
diff --git install/wsdl_install.py install/wsdl_install.py
|
||||
index c9bc196..bff5954 100644
|
||||
--- install/wsdl_install.py
|
||||
+++ install/wsdl_install.py
|
||||
@@ -65,6 +65,7 @@ class Wsdl(WsdlBase):
|
||||
normal=('os_install_locale_lang','os_install_clock_timezone')),
|
||||
lambda group:group(_("Distribution"),
|
||||
normal=('cl_image_filename',),
|
||||
+ hide=('cl_image_linux_shortname','cl_image_arch_machine'),
|
||||
expert=('cl_image_linux_shortname', 'cl_image_arch_machine',
|
||||
'cl_image_new_only')),
|
||||
lambda group:group(_("Allocate drive space"),
|
||||
@ -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.2.0_alpha12-r2
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha12-r2
|
||||
=sys-apps/calculate-lib-3.2.0_alpha12-r6
|
||||
=sys-apps/calculate-core-3.2.0_alpha12-r1
|
||||
=sys-apps/calculate-update-3.2.0_alpha12-r5
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha12 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha12 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha12 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha12 )
|
||||
"
|
||||
Loading…
Reference in new issue