parent
a4a013f1de
commit
2d40e03d2d
@ -0,0 +1,50 @@
|
||||
# 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
|
||||
!<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}"
|
||||
|
||||
# changes
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-r3.patch"
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-fix_install_grub.patch"
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0-fix_using_lvm.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,22 @@
|
||||
commit 44702d83818612f64715778331b8a6d439d1e090
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Mon Aug 6 15:14:30 2012 +0400
|
||||
|
||||
Fix detect LVM
|
||||
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 4b5730a..018fe70 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -708,7 +708,10 @@ class VariableOsLocationSource(LocationHelper,DeviceHelper,Variable):
|
||||
# check wrong dev
|
||||
###########################
|
||||
disks = filter(lambda x:x.startswith('/dev/'),value)
|
||||
- wrongDevices = list(set(disks) - \
|
||||
+ # get original /dev names
|
||||
+ cnDisks = map(lambda x:getUdevDeviceInfo(name=x).get('DEVNAME',x),
|
||||
+ disks)
|
||||
+ wrongDevices = list(set(cnDisks) - \
|
||||
set(self.fixOsDiskDev()))
|
||||
if wrongDevices:
|
||||
raise VariableError(_("Wrong device '%s'")%wrongDevices[0])
|
||||
@ -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-r5
|
||||
=sys-apps/calculate-i18n-3.0.0
|
||||
=sys-apps/calculate-lib-3.0.0-r1
|
||||
=sys-apps/calculate-core-3.0.0-r2
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0-r2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.0.0-r1 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue