parent
9f5c0f5c5b
commit
282bc72dd6
@ -0,0 +1,41 @@
|
||||
# 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
|
||||
epatch "${FILESDIR}/calculate-install-2.2.20-fix_detect_image.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For configure calculate-install perform:"
|
||||
einfo " cl-install --install"
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
commit 0d7b2346729005b74f948c132331ee7d4173785b
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Thu Jul 28 09:31:38 2011 +0400
|
||||
|
||||
Fix the determining of installation image.
|
||||
|
||||
LiveUSB excluded from the list of devices from which you can install the
|
||||
system if the system installation is on it.
|
||||
|
||||
diff --git a/pym/cl_fill_install.py b/pym/cl_fill_install.py
|
||||
index fdefcbf..030902a 100644
|
||||
--- a/pym/cl_fill_install.py
|
||||
+++ b/pym/cl_fill_install.py
|
||||
@@ -736,9 +736,10 @@ class fillVars(object, glob_attr):
|
||||
livedistr = ['/mnt/cdrom']
|
||||
else:
|
||||
livedistr = []
|
||||
+ rootDev = self.Get('os_install_root_dev')
|
||||
livedistr += \
|
||||
map(lambda x:x[0],
|
||||
- filter(lambda x:" live" in x[1],
|
||||
+ filter(lambda x:" live" in x[1] and x[0] != rootDev,
|
||||
zip(self.Get('os_disk_dev'),
|
||||
self.Get('os_disk_content'))))
|
||||
return ['/var/calculate/remote/linux',
|
||||
@ -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-r1
|
||||
=sys-apps/calculate-templates-2.2.20
|
||||
=sys-apps/calculate-lib-2.2.20-r1
|
||||
=sys-apps/calculate-i18n-2.2.20
|
||||
|
||||
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