parent
3f429bce4b
commit
234c4a1448
@ -1,4 +1,4 @@
|
||||
# Calculate os_audio_default!=0
|
||||
# Calculate os_audio_default_set==on
|
||||
defaults.ctl.card #-os_audio_default-#
|
||||
defaults.pcm.card #-os_audio_default-#
|
||||
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
# 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
|
||||
!<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 )"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-install-3.1.5-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,102 @@
|
||||
diff --git install/variables/autopartition.py install/variables/autopartition.py
|
||||
index 7c9c4da..52ca7a9 100644
|
||||
--- install/variables/autopartition.py
|
||||
+++ install/variables/autopartition.py
|
||||
@@ -869,7 +869,7 @@ class VariableClAutopartitionDeviceSize(ReadonlyVariable):
|
||||
_in=devices))
|
||||
# TODO: remove set 10G
|
||||
#return str(1024*1024*1024*10)
|
||||
- return str(reduce(operator.add,sizeDevice))
|
||||
+ return str(reduce(operator.add,sizeDevice,0))
|
||||
|
||||
class VariableClAutopartitionFreeSize(ReadonlyVariable):
|
||||
"""
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 639aa85..5988067 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -1680,6 +1680,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
if len(value) > 1:
|
||||
raise VariableError(
|
||||
_("For Flash install, you need only one disk"))
|
||||
+ if self.Get('os_install_uefi_set') == 'on':
|
||||
+ return
|
||||
for mbrDisk in value:
|
||||
if self.Get('cl_autopartition_set') == 'on':
|
||||
tableOnBootDisk = self.Get('cl_autopartition_table')
|
||||
diff --git install/variables/system.py install/variables/system.py
|
||||
index 184f651..7e3c498 100644
|
||||
--- install/variables/system.py
|
||||
+++ install/variables/system.py
|
||||
@@ -19,7 +19,8 @@ import sys
|
||||
import re
|
||||
from os import path
|
||||
from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable, \
|
||||
- TableVariable,PasswordError
|
||||
+ TableVariable,PasswordError, \
|
||||
+ ReadonlyTableVariable,FieldValue
|
||||
from calculate.install.fs_manager import FileSystemManager
|
||||
from calculate.lib.utils.files import (readFile,getProgPath,process,
|
||||
readLinesFile)
|
||||
@@ -650,3 +651,61 @@ class VariableOsInstallGrubTerminal(Variable):
|
||||
|
||||
def choice(self):
|
||||
return ['gfxterm','console']
|
||||
+
|
||||
+class VariableOsAudioData(ReadonlyTableVariable):
|
||||
+ """
|
||||
+ Information about audio cards
|
||||
+ """
|
||||
+ source = ['os_audio_id',
|
||||
+ 'os_audio_name']
|
||||
+
|
||||
+ def get(self,hr=False):
|
||||
+ """LVM hash"""
|
||||
+ aplay = getProgPath('/usr/bin/aplay')
|
||||
+ if not aplay:
|
||||
+ return [[]]
|
||||
+ entry = re.compile('^card (\d+): ([^,]+)')
|
||||
+ return tuple(map(lambda x:x.groups(),
|
||||
+ filter(None,map(entry.search,
|
||||
+ process(aplay,'-l')))))
|
||||
+
|
||||
+ setValue = Variable.setValue
|
||||
+
|
||||
+class VariableOsAudioId(FieldValue,ReadonlyVariable):
|
||||
+ """
|
||||
+ Order Id of audio card
|
||||
+ """
|
||||
+ type = "list"
|
||||
+ source_variable = "os_audio_data"
|
||||
+ column = 0
|
||||
+
|
||||
+class VariableOsAudioName(FieldValue,ReadonlyVariable):
|
||||
+ """
|
||||
+ Name of audio card
|
||||
+ """
|
||||
+ type = "list"
|
||||
+ source_variable = "os_audio_data"
|
||||
+ column = 1
|
||||
+
|
||||
+class VariableOsAudioDefault(Variable):
|
||||
+ """
|
||||
+ Current default audio card
|
||||
+ """
|
||||
+ type = "choice"
|
||||
+ opt = ['--audio']
|
||||
+
|
||||
+ def init(self):
|
||||
+ self.label = _("Default audio card")
|
||||
+ self.help = _("set default audio card")
|
||||
+
|
||||
+ def get(self):
|
||||
+ defaultCardRe = re.compile('defaults.ctl.card\s+(\d+)')
|
||||
+ entry = defaultCardRe.search(readFile('/etc/asound.conf'))
|
||||
+ if entry and entry in self.Get('os_audio_id'):
|
||||
+ return entry.groups()[0]
|
||||
+ res = self.Select('os_audio_id',where='os_audio_name',
|
||||
+ notlike='HDMI',limit=1)
|
||||
+ return res or '0'
|
||||
+
|
||||
+ def choice(self):
|
||||
+ return self.Get('os_audio_data')
|
||||
@ -0,0 +1,35 @@
|
||||
# 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 library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.5-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
|
||||
index 415d5ef..1fac4d6 100644
|
||||
--- calculate/lib/variables/__init__.py
|
||||
+++ calculate/lib/variables/__init__.py
|
||||
@@ -25,4 +25,4 @@ class VariableClVer(ReadonlyVariable):
|
||||
"""
|
||||
Package version
|
||||
"""
|
||||
- value = "3.1.5"
|
||||
+ value = "3.1.5.1"
|
||||
@ -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-r2
|
||||
=sys-apps/calculate-i18n-3.1.5
|
||||
=sys-apps/calculate-lib-3.1.5-r1
|
||||
=sys-apps/calculate-core-3.1.5-r1
|
||||
=sys-apps/calculate-update-3.1.5
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.5-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.5 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.5 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.5 )
|
||||
"
|
||||
Loading…
Reference in new issue