parent
7f37080b32
commit
3dadfb029e
@ -1,9 +1,11 @@
|
||||
AUX calculate-install-3.1.3-r4.patch 5796 SHA256 7cf35d4247286b346e8746660c9e322bc341477d695c227830b7c622553f4d2b SHA512 1d2a91a65983f3e3464d6c268a0aa15bf1e8d06d21355e95709c49eef66317f1c93c626ac5ab70738410f9ad886dc0718562942d3eb9c7c3bd7f9e58be09cab8 WHIRLPOOL adc68ebdc8fcc9a2deb07463bb38ce501e9c911d9deb8b8f2219584ca82d72cd9497c44e0cc83e961cc5fe2d7374f06164eb7dc1c44a45128f4f1d889d899433
|
||||
AUX calculate-install-3.1.5_beta1-r2.patch 2385 SHA256 57cf26530ede5d607aa98bc4ce36f1ba4521b9b8a3f34d90a9bf3cc0f10fb13e SHA512 cbb4b90c08cf34d4337957e161e3f15209a1dd359d616d27b45bb68737754d006466e01d7ebd2dd4d7c097eeb320f22355fdab25de6425f4a3293078c081167e WHIRLPOOL 5c8dda93a7ac76622867ce8973995bd898dfd86996105cb228cbdf2615ca5aea6cefb8267151c391c63b95b8b2536f4596168e774d5ba20422ea4048fcbe18b6
|
||||
AUX calculate-install-3.1.5_beta1-r3.patch 3043 SHA256 f329aeab842fa4cd661662b3cc21ae43202734744d4ba565c4c0b6d0d59984ca SHA512 f45aea68159717a3d59f44f65e26c3e89ab9e44b840263fed4da8086ec563f71449c68515171bf77550fe460333551d4e9463f8c3baad02c9d9efbf1f9f76573 WHIRLPOOL b36f1905a36e8e5622c6d9c9d5c6e0eb048ded9214d256b5412af8e37a6c3774545ec0b8f494abe58368c05e9987dfc38606ae4446b6b3af6380dfdf6c9277a6
|
||||
DIST calculate-install-3.1.3.tar.bz2 75004 SHA256 218d13ff06059ff85e5f473af55a46959cf0a21705f0cf1a4be833075e0b93c9 SHA512 6ea8ce4e78cde0031544628ae225d35ae1abc91d3fee99a14089c83669b3cf3b246e19c702437dbd823f18e37e43284d97a3196fc8296e4362b1800ba7093a00 WHIRLPOOL 3130479118e1314c17488c8c4bb04328726dfffc85e941e2447910795cc47e00a38b683b61a55eed2cdfe54b502826ea813c195e17caf5687855cafd62ebc148
|
||||
DIST calculate-install-3.1.5_beta1.tar.bz2 76923 SHA256 abe5119fb9b281dead001eb8e071e29885e68dd552ad3d7e0558105a76e2b80f SHA512 643fbd8453210450c5c099bfe4eb24399cecf23d2e99c90f4a0df134cf2b1e005db4e16b8e7d2f4ee0e9c47d527c27da500f9df7f056a15ba82464edc3960df1 WHIRLPOOL b80f781aa14202ec315fb321d3cd3cdd8b9a359a1b4cac2d2294a83d1d4832879387fcf9707487cafc28df4e6d6d2b9d40b84822ee599aec67172f69c09235ad
|
||||
EBUILD calculate-install-3.1.3-r4.ebuild 1062 SHA256 2df43e4f1133ceaaa4da735b18e85b5cda1c074cc47f5d4ad5556e8163cad3a7 SHA512 d04a319dd04de4669663709c46443eb36ab8ac0ec1f0a4abc6de8dc602a0c8cc379871305b44790cd991f6baa02b13e7eb1101af63ea48ffa0ab4205df07722c WHIRLPOOL bfb8f7f1ec7ebce61a2907836437cc52f93499026f3cb69c468eaecba8950a01f77210645b10977ecd059e640bbf35332165f42e3667a00f471527f41c123f10
|
||||
EBUILD calculate-install-3.1.5_beta1-r2.ebuild 1075 SHA256 27144e927144f0e7f8b458b8093374b61d85847f2e55a292db1effb7415ce559 SHA512 8b41570d1df5ef2b7d3c58545ca54302785b2b852078352d1f57176acea421ca339f4de3816d3bb8a2c843067ba47d12e8741810ab711395083e9dd7531dfc50 WHIRLPOOL f9f386f44a31b6a1a3ddacaf560267a94df78920b1a0fd299d9d0dd248e426aeed89801da1461883378ae74edff2abeafbb6451c40eda01dffad028f35145d67
|
||||
EBUILD calculate-install-3.1.5_beta1-r3.ebuild 1075 SHA256 c948c0cb0855a5a391e2d617f6c98be99d214444fa0e5cb1cd2e1960c56e772f SHA512 2eda62a3d28bf6e7cf0d01ed31a8413009638e1fa2e88e455529200817fc0d73e9c05998e6429f9d18feb1d531de33a2249c6562f4cf376cb5c5586b81574c32 WHIRLPOOL 849f30e3dce582876d3c876f56def79babcea2c8e9dd31f253b116c514a1eb83633cb16427d210f82bfdf3ce6f266c83789c83a9de5b1ffdba6ce116d24f9fd9
|
||||
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78
|
||||
MISC ChangeLog 33978 SHA256 a1cc544f9763b08b3647d90fac1ec53748016bb23260181315896c8c02431443 SHA512 11a09ba60fbc727bd47b57653b4bb0937d98774eb9ca95680a5b55997c7e22db3976cbd0878d908fa0200e04b6cc9eb0ae9ac6f1623235490e2e46e54cc1f7f4 WHIRLPOOL 50352c2950f301cbb5116b8c9972e592767dcb03bd71d081c75de5e69b2a920331abec4756658faf64e291bf6f4f41df67b8d62946683629a2c99b48274eb2f3
|
||||
MISC metadata.xml 464 SHA256 0e3ea52c58e77580b778f7efb9f476811c168febe02e656961c71a455e4f4d7d SHA512 dd79935fabf9b629ee0913eae0cec88b0d6e46fc58e9b430e07e2a60f2e0ce66e8c257a3da33e17663a778d2a18b3a12f96f18cbc6e009f071788ed9353e4a29 WHIRLPOOL 8f72663b95c36637d15d40e0c56e5fd9e7e06e073993d202d788df1704bb979e794cde966428675f158786e273ba5677151d15d8e40a4715f769172a8ebf3e1e
|
||||
|
||||
@ -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-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 8a75181..639aa85 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -804,7 +804,12 @@ class VariableOsLocationDest(LocationHelper,Variable):
|
||||
if type(val) == str and val:
|
||||
return path.normpath(val)
|
||||
return val
|
||||
- value = map(normpath,value)
|
||||
+ def eficonvert(val):
|
||||
+ if val.lower() in ("efi","uefi"):
|
||||
+ return "/boot/efi"
|
||||
+ else:
|
||||
+ return val
|
||||
+ value = map(normpath,map(eficonvert,value))
|
||||
return map(lambda x:x or "/",value)
|
||||
|
||||
def choice(self):
|
||||
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-r3
|
||||
=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