parent
01a764fe1b
commit
c9eb09bcd2
@ -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="amd64 x86"
|
||||
IUSE="pxe minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-core-3.1.5_beta1
|
||||
!<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 )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.5_beta1-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
diff --git install/variables/kernel.py install/variables/kernel.py
|
||||
index 0de0cd5..7ba7233 100644
|
||||
--- install/variables/kernel.py
|
||||
+++ install/variables/kernel.py
|
||||
@@ -56,11 +56,17 @@ class VariableOsInstallKernelScheduler(Variable):
|
||||
if "OCZ" in dev_name or "SSD" in dev_name:
|
||||
return "noop"
|
||||
else:
|
||||
- return getValueFromCmdLine('elevator',0) or "cfq"
|
||||
+ currentScheduler = getValueFromCmdLine('elevator',0)
|
||||
+ if currentScheduler in map(lambda x:x[0],self.choice()):
|
||||
+ return currentScheduler
|
||||
return "cfq"
|
||||
|
||||
def choice(self):
|
||||
- return [("deadline","Deadline"),("cfq","CFQ"),("noop","No-op")]
|
||||
+ schedulers = [("deadline","Deadline"),("cfq","CFQ"),("noop","No-op")]
|
||||
+ if self.Get('os_install_kernel_bfq_set') == 'on':
|
||||
+ return schedulers + [("bfq","BFQ")]
|
||||
+ else:
|
||||
+ return schedulers
|
||||
|
||||
def uncompatible(self):
|
||||
"""
|
||||
@@ -69,6 +75,23 @@ class VariableOsInstallKernelScheduler(Variable):
|
||||
if self.Get('os_install_root_type') == 'flash':
|
||||
return _("I/O scheduler unavailable for Flash install")
|
||||
|
||||
+class VariableOsInstallKernelBfqSet(ReadonlyVariable):
|
||||
+ """
|
||||
+ Available BFQ in kernel
|
||||
+ """
|
||||
+ type = "bool"
|
||||
+
|
||||
+ def get(self):
|
||||
+ image = self.Get('cl_image')
|
||||
+ if image:
|
||||
+ with image as distr:
|
||||
+ distrPath = image.getDirectory()
|
||||
+ kernelConfig = path.join(distrPath,"usr/src/linux/.config")
|
||||
+ if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x,
|
||||
+ readLinesFile(kernelConfig)):
|
||||
+ return "on"
|
||||
+ return "off"
|
||||
+
|
||||
class VariableOsInstallKernelAttr(Variable):
|
||||
"""
|
||||
Install kernel attributes
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 2e33a49..184f651 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -644,7 +644,7 @@ class VariableOsInstallGrubTerminal(Variable):
|
||||
return 'console'
|
||||
grubDefault = path.join(self.Get('cl_chroot_path'),
|
||||
'etc/default/grub')
|
||||
- if getValueFromConfig(grubDefault,'GRUB_TERMINAL_OUTPUT') == 'console':
|
||||
+ if getValueFromConfig(grubDefault,'GRUB_TERMINAL') == 'console':
|
||||
return 'console'
|
||||
return 'gfxterm'
|
||||
|
||||
@ -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.1.5_beta1-r2
|
||||
=sys-apps/calculate-i18n-3.1.5_beta1-r1
|
||||
=sys-apps/calculate-lib-3.1.5_beta1
|
||||
=sys-apps/calculate-core-3.1.5_beta1
|
||||
=sys-apps/calculate-update-3.1.5_beta1
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.5_beta1-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5_beta1-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5_beta1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.5_beta1 )
|
||||
"
|
||||
Loading…
Reference in new issue