parent
3c2c1b774f
commit
8f118fd993
@ -0,0 +1,45 @@
|
||||
# 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=""
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.5_alpha2
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
>=sys-fs/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 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.5_alpha2-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 92f275f..d2d2ba9 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -986,8 +986,8 @@ class VariableOsLocationFormat(LocationHelper,Variable):
|
||||
return "vfat"
|
||||
if dev in diskFormat and diskFormat[dev] in availFS:
|
||||
if mount.count('/') == 1:
|
||||
- if FileSystemManager.checkFSForType(diskFormat[dev],
|
||||
- osInstallRootType):
|
||||
+ if FileSystemManager.checkFSForTypeMount(diskFormat[dev],
|
||||
+ osInstallRootType,mount):
|
||||
return diskFormat[dev]
|
||||
else:
|
||||
return diskFormat[dev]
|
||||
diff --git install/variables/kernel.py install/variables/kernel.py
|
||||
index ae2a8f0..0de0cd5 100644
|
||||
--- install/variables/kernel.py
|
||||
+++ install/variables/kernel.py
|
||||
@@ -93,7 +93,11 @@ class VariableOsInstallKernelResume(ReadonlyVariable):
|
||||
for dev, install in zip(self.Get('os_install_disk_use'),
|
||||
self.Get('os_install_disk_mount')):
|
||||
if install == "swap":
|
||||
- return "real_resume=%s"%dev
|
||||
+ if self.Get('os_install_linux_system') == 'desktop':
|
||||
+ return \
|
||||
+ "tuxonice tuxonice_resume=%s real_resume=%s"%(dev,dev)
|
||||
+ else:
|
||||
+ return "real_resume=%s"%dev
|
||||
return ""
|
||||
|
||||
class KernelHelper:
|
||||
@ -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=""
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.5_alpha2-r1
|
||||
=sys-apps/calculate-i18n-3.1.5_alpha2
|
||||
=sys-apps/calculate-lib-3.1.5_alpha2
|
||||
=sys-apps/calculate-core-3.1.5_alpha2
|
||||
=sys-apps/calculate-update-3.1.5_alpha2
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.5_alpha2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5_alpha2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5_alpha2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.5_alpha2 )
|
||||
"
|
||||
Loading…
Reference in new issue