parent
234c4a1448
commit
ada8eb3e8f
@ -0,0 +1,30 @@
|
||||
# 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 utilities for assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-3.1.5"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${RDEPEND}"
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-i18n-3.1.5-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
diff --git ru/cl_install3.po ru/cl_install3.po
|
||||
index 5765750..697e19c 100644
|
||||
--- ru/cl_install3.po
|
||||
+++ ru/cl_install3.po
|
||||
@@ -194,6 +194,9 @@ msgstr "Сетевые настройки"
|
||||
msgid "Users"
|
||||
msgstr "Пользователи"
|
||||
|
||||
+msgid "Audio"
|
||||
+msgstr "Аудио"
|
||||
+
|
||||
msgid "Video"
|
||||
msgstr "Видео"
|
||||
|
||||
@@ -606,6 +609,9 @@ msgstr "параметры видео"
|
||||
msgid "boot parameters"
|
||||
msgstr "параметры загрузки"
|
||||
|
||||
+msgid "audio parameters"
|
||||
+msgstr "звуковые параметры"
|
||||
+
|
||||
msgid "user settings"
|
||||
msgstr "настройки пользователей"
|
||||
|
||||
@@ -666,6 +672,12 @@ msgstr "Grub терминал"
|
||||
msgid "grub terminal"
|
||||
msgstr "grub терминал"
|
||||
|
||||
+msgid "Default audio card"
|
||||
+msgstr "Звуковая карта по умолчанию"
|
||||
+
|
||||
+msgid "set default audio card"
|
||||
+msgstr "установить звуковую карту по умолчанию"
|
||||
+
|
||||
msgid "Installation image"
|
||||
msgstr "Установочный образ"
|
||||
|
||||
@ -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-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,188 @@
|
||||
diff --git install/cl_wsdl_install.py install/cl_wsdl_install.py
|
||||
index c5e61bd..68eb984 100644
|
||||
--- install/cl_wsdl_install.py
|
||||
+++ install/cl_wsdl_install.py
|
||||
@@ -75,6 +75,7 @@ class InstallInfo(CommonInfo):
|
||||
os_install_x11_composite = Boolean
|
||||
os_install_fb_resolution = String
|
||||
os_install_grub_terminal = String
|
||||
+ os_audio_default = String
|
||||
|
||||
cl_autopartition_device = Array(String)
|
||||
cl_autopartition_scheme = Array(String)
|
||||
@@ -141,6 +142,8 @@ class Wsdl:
|
||||
normal=('cl_migrate_root_pwd','cl_migrate_data','cl_autologin'),
|
||||
hide=('cl_migrate_data',),
|
||||
brief=('cl_migrate_user',))
|
||||
+ dv.addGroup(_("Audio"),
|
||||
+ normal=('os_audio_default',))
|
||||
dv.addGroup(_("Video"),
|
||||
normal=('os_install_x11_video_drv','os_install_x11_composite',
|
||||
'os_install_x11_resolution','os_install_fb_resolution',
|
||||
@@ -399,3 +402,33 @@ class Wsdl:
|
||||
@installCatchExcept
|
||||
def setup_system_view (self, sid, params):
|
||||
return commonView(self,sid,params,"setup_system")
|
||||
+
|
||||
+ def setup_audio_vars(self):
|
||||
+ dv = cl_install.DataVarsInstall()
|
||||
+ dv.importInstall()
|
||||
+ dv.flIniFile()
|
||||
+ dv.Set('cl_action','merge',True)
|
||||
+ dv.Set('cl_merge_pkg',[None],True)
|
||||
+ dv.Set('cl_merge_set',"on",True)
|
||||
+ dv.Set('cl_setup','audio',True)
|
||||
+ dv.addGroup(None,
|
||||
+ normal=('os_audio_default',),
|
||||
+ expert=('cl_templates_locate',"cl_dispatch_conf","cl_verbose_set"),
|
||||
+ next_label=_("Save"))
|
||||
+ return dv
|
||||
+
|
||||
+ @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
|
||||
+ @core_method(category=__('Configuration'),title=__('Audio'),
|
||||
+ image='audio-card',command="cl-setup-audio",
|
||||
+ gui=True, rights=['setup'])
|
||||
+ def setup_audio ( self, sid, info):
|
||||
+ """
|
||||
+ Setup locale
|
||||
+ """
|
||||
+ return self.callMethod(sid,info,logicClass=cl_install.Install,
|
||||
+ method="setupSystem",method_name="setup_audio")
|
||||
+
|
||||
+ @rpc(Integer, ViewParams,_returns = ViewInfo)
|
||||
+ @installCatchExcept
|
||||
+ def setup_audio_view (self, sid, params):
|
||||
+ return commonView(self,sid,params,"setup_audio")
|
||||
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..84e8439 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)
|
||||
@@ -509,13 +510,14 @@ class VariableClSetup(Variable):
|
||||
value = ""
|
||||
|
||||
def choice(self):
|
||||
- return ["network","locale","video","boot","users",""]
|
||||
+ return ["audio","network","locale","video","boot","users",""]
|
||||
|
||||
def humanReadable(self):
|
||||
mapType = {'network':_("network settings"),
|
||||
'locale':_("localization and time options"),
|
||||
'video':_("video settings"),
|
||||
'boot':_("boot parameters"),
|
||||
+ 'audio':_("audio parameters"),
|
||||
'users':_("user settings") }
|
||||
return mapType.get(self.Get(),"")
|
||||
|
||||
@@ -650,3 +652,76 @@ 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 VariableOsAudioDefaultSet(ReadonlyVariable):
|
||||
+ """
|
||||
+ Force write in config 0
|
||||
+ """
|
||||
+ type = "bool"
|
||||
+
|
||||
+ def get(self):
|
||||
+ res = self.Select('os_audio_id',where='os_audio_name',
|
||||
+ notlike='HDMI',limit=1)
|
||||
+ audioDefault = self.Get('os_audio_default')
|
||||
+ if audioDefault != '0' or \
|
||||
+ res and res != "0" and audioDefault == '0':
|
||||
+ return 'on'
|
||||
+ return 'off'
|
||||
+
|
||||
+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.groups()[0] 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,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-r3
|
||||
=sys-apps/calculate-i18n-3.1.5-r1
|
||||
=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