diff --git a/sys-apps/calculate-install/Manifest b/sys-apps/calculate-install/Manifest index c264dc0c6..38d4708dc 100644 --- a/sys-apps/calculate-install/Manifest +++ b/sys-apps/calculate-install/Manifest @@ -15,6 +15,7 @@ AUX calculate-install-3.1.9-r11.patch 10794 SHA256 04331ce870cba46088ce36d518a9a AUX calculate-install-3.1.9-r12.patch 12031 SHA256 f2e1c8924089396c1d442d59b82b14ebd00392d1344552e30c7176ae49d7300c SHA512 fb27ddfe79379847d622f99d8057686193d8b1be3f95d693d0d3a09bbe266e2a81f922f70e602f6e6b316aa7dee97d3c70cd376a5a8b6a86681d0461cb788f5a WHIRLPOOL 3bb01f9de52c098ef39f4657dd586703200193a33c2882aa6e55dd4def6e1c2d1da0ba8d4193b8376b7bd09695eaf16f9e4035cbe7ea17e31369e3fce391a2c8 AUX calculate-install-3.1.9-r13.patch 13783 SHA256 85146f0ce1a558bd2ca11eb04dccfdbdacecd07edd464a55f56c1926cf03a87c SHA512 bb4e0bd06794e2b5a15c5ff574331825b8a5307bafdefb2f20e3d47bb4e001ca9affc1436090803a05589aad2da628a94d94f35deb46cd85fa8d3d771775a6f9 WHIRLPOOL 10bcec4af654b66950da35f09efa694b88a28dd1f9e08c3479220ade799cf3be72aa7890f6335159b0ffda415d0b0780c663dfe139310d208b46a86ebf56f526 AUX calculate-install-3.1.9-r14.patch 14399 SHA256 6385e15c07fecbe9724dec2ee3685d3d4b3921a8a22d85e99ef00515c8edf082 SHA512 964dad92bb2396c7e35fb7b451e79b14a309ab320eaa822d71b05aa3f0f551808b2073b23a5af79ab9f22b29c0c951018855fc0604d4d780e5ed397421ec76ab WHIRLPOOL ebf76b011dea508eb1d28b20c962c5c896be5db620826ac3acc8d8ceb21a3ff416abbe81c7b1c654e63b31c10b61aa49d42f0d1c0e234377aec8475ee9c13d4d +AUX calculate-install-3.1.9-r15.patch 15822 SHA256 e8f5dbfaab9b79284b53c3d1cf661d58592b384095b50ee52b1f08f3ebce4a99 SHA512 da243e99f711558b48c1f03c18791feed617e6eff3f997c9cece83ca4db407477e24f496682b53bc4aa1b35212188a42cd74a9fc30cb838617cd096b45042142 WHIRLPOOL dfc8c83406d2c3ad35456ecc5e42a1345916ef4544abc96e9891fe8c0a4aa9bcf51f963b7ef8d5569dea7abece75f0c2f4a3332a971c180515c19482bbea5fa0 AUX calculate-install-3.1.9-r2.patch 1830 SHA256 3c824988d608a0d390639d4244988733525c911edb2457e1815766f9619ba246 SHA512 f97fa46b21e945e0f58cda31a2c5de30e5951aa96bcd97bf176addfc9b347fa38890c43aafd2186b08a8f8ccd56437502b945c74da1b104d9fd3266f1d6f3cfa WHIRLPOOL 2b6bdae69c1e9dd05b22bd7c8eaf37f6917344c0a7cdcfd06d9519b56e43a6da640a9414582e05a4b9f797e41bbbd1abbf60102b803e4d5789ede46b3311a4ce AUX calculate-install-3.1.9-r3.patch 5207 SHA256 8206f8c0450a5d8b70c2fea85e1321385dac7ddef08250897f91a73104c10395 SHA512 acc60616e0c32f0a30c95a3f251b9b526c5da23e9f039cf1a7c62a74406ce82aaaa779ffa1e79314a2b6348157097516835462d1c7b050bafd0b8a5b4d066761 WHIRLPOOL 2dfe264a75a8bd96226722f01b4cdc1f0cc1986f7c0f51b1a2ef64662a7a119467b82a841cb51c0168c87a3e42e53a69db4a3b9d45dd17ba2d2a2e4abbeed346 AUX calculate-install-3.1.9-r4.patch 6433 SHA256 bb447b6c506daa179ef4062e73ba1dd07694d9219de7783b384ae56838f82f3a SHA512 fbce8d9c89936f396150e7d898192158ac38c43df1af90144d9b588bb4c639fd3f8b0c5ba7a9211961420893276741d59cb037499de173dfb9ff5be1124f6ca2 WHIRLPOOL abd4651ad0769817529a51fc4848915ec7347f06c202334229f6d6dc0cabb53e986800ba190ad589eb29a0414170d09e7f9f785a0ac1876ff294dd2d22706aa0 @@ -43,6 +44,7 @@ EBUILD calculate-install-3.1.9-r11.ebuild 1034 SHA256 8b232c960801527c43569bf5f7 EBUILD calculate-install-3.1.9-r12.ebuild 1034 SHA256 797bcfa4746e688006d64523c91d5a4646e86b8724dad26c6c82ac4803431d47 SHA512 9fe7eb0c8ee1092dc1aba1867eddb9cfc0c320629c5e24d495264dc28fd81ca8522a07a222dfcbad5852ba80cf5e6e2686964b3c53a16c26d60d2ea11a2f8327 WHIRLPOOL 79920a5f4a08f23fff3d33e4617a4e4b8eabe74508f7ff300af3604c1effb713e26c764588c6938e586ea6559f4a36e7e3514351be4058726643ce5a355560cc EBUILD calculate-install-3.1.9-r13.ebuild 1044 SHA256 1ce3fcbde3beca4bce10a01f1ac47ff668bff13af4f7bbce9ee7e737db18bf83 SHA512 5bbd472fc0470d2fac85c462bd64aaf54a130c1bf2a7e007d7002be55ded87ea83f77545277169f94b922aa97d901ff5dba003f2a2aef4ef55941d211e2b79c5 WHIRLPOOL d8fe76f5d026a36998e5a47ae8f3408d99f43e331d2a9a9fe37fd8c5a4b24a3540e22cd7a5baf8ae8ea1916a8977c7d2997e952c2826dbbb7f5f0b87d2d07dc6 EBUILD calculate-install-3.1.9-r14.ebuild 1044 SHA256 737626082578f4c5e430424d6a5714ea04ae55999dc1a37e4fe50cd2f9ec6d10 SHA512 05328fa264e2300a25c9e0dbb2982b1beba8e50ee0b0b98f324cc87a65e7f95c0856fac5f467d2340ad8f83adcd511b1b2c49673934863e6b1e7b2e41b8690f7 WHIRLPOOL 8cf168df48220d75e3e0b322069c41f97dd78b7757aae20e85aa393da7e4f6547e8c2587560120732d92d93ccee75d07b47d124c7a731b236d112e961feae7f8 +EBUILD calculate-install-3.1.9-r15.ebuild 1044 SHA256 8731167474ee21e1428108695713b61d9f1af00524de14871c63345a2edfa4c0 SHA512 c9b797310ac974a345abd6239de9b69dca71b096a05fa2125534515554b707dbda42967f67bf6a9ddaca57f3a917420ae1b49563a9d10f3f73d38fe401be7166 WHIRLPOOL ac7bffdc4e523c24e3ec03888ce73d7e5f0fe5fea6a62a95cc2a898440cefe5b0dd5e6ab577e542f3127f7f15dd4ed66ce668c5ee8a8e1dedd3a324e2f03fedd EBUILD calculate-install-3.1.9-r2.ebuild 1033 SHA256 b9390b53bc3e40a1641ef5e5cf59c70f0f82adc498221f46fcf9ebcb45241c1b SHA512 5b52c2d548810bc0df30bc4cb9d093df8622214c0166ae7ba245fa915e2a186f8ee5c71e8d401f0a1ab8d36f638f244adb07dd916a89497adac5239aea49d44f WHIRLPOOL c6e77932350157cb893ea7352e9fb2ef92c3928521d3389d273569f028f1f41970a82d3a07506049f1722b04ee05c120ad510a3a846d013673c078c22f2668b2 EBUILD calculate-install-3.1.9-r3.ebuild 1033 SHA256 76dfbc44103c5b4c2a6c0bdd7f58a9fc63e9d81c39ed98e0beedb9ff01640e3b SHA512 bcbdc4371fa7494e7677b8db2cc7b73d6127e0e3d364143b15f3b152ccd03a7d8a4e2aa016508ca62a1cc2e7ef4704eaf17372b5be60613bb9a96d0e06f67731 WHIRLPOOL b5c2af968adbb8916216144a00a8204a0e4c1d51b075f896a350e8d4c6e9248ad0d1b35a60d7e4585855f55a3b5996c015d4d23676731b8937874f47eaf2232d EBUILD calculate-install-3.1.9-r4.ebuild 1033 SHA256 84a8ea3dcb0537a6f5b0ee42ed105d29e96547f78979d54a1ec57d80c12bdbc0 SHA512 6d726a15b9fb368622c36e82343641910b1e79420e709891f28973d44a621820a1d8676562e9f971e3e06ce740f88e3771e47d43aa846f84e0b65febf3b2fa43 WHIRLPOOL 4043aea2cbe620cf229285e53d6c3bdcd6d47e200e9d33a600b14d35ff075ec54513807adab9ac3e3bd7e2720f9306ec640a894f1a20ee203c4d33b63fe4b592 diff --git a/sys-apps/calculate-install/calculate-install-3.1.9-r15.ebuild b/sys-apps/calculate-install/calculate-install-3.1.9-r15.ebuild new file mode 100644 index 000000000..8156175d1 --- /dev/null +++ b/sys-apps/calculate-install/calculate-install-3.1.9-r15.ebuild @@ -0,0 +1,44 @@ +# 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.9 + !=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.9-r15.patch" +} diff --git a/sys-apps/calculate-install/files/calculate-install-3.1.9-r15.patch b/sys-apps/calculate-install/files/calculate-install-3.1.9-r15.patch new file mode 100644 index 000000000..7bbefcde7 --- /dev/null +++ b/sys-apps/calculate-install/files/calculate-install-3.1.9-r15.patch @@ -0,0 +1,354 @@ +diff --git data/calculate data/calculate +index c7f60b9..60a24b0 100644 +--- data/calculate ++++ data/calculate +@@ -134,10 +134,6 @@ start() { + touch /* /bin/* /sbin/* + udevadm trigger --action="add" --subsystem-match=net + fi +- if [[ $roottype != "livecd" ]] +- then +- /usr/bin/eix-checkout &>/dev/null & +- fi + + /sbin/rc-update --update + return 0 +diff --git install/distr.py install/distr.py +index 88de47f..e6202e8 100644 +--- install/distr.py ++++ install/distr.py +@@ -31,7 +31,8 @@ from functools import partial + from calculate.lib.utils.files import (runOsCommand,isMount,removeDir, + processProgress,countFiles,STDOUT, + typeFile,pathJoin,process,getRunCommands, +- readLinesFile,getProgPath,listDirectory,checkUtils) ++ readLinesFile,getProgPath,listDirectory,checkUtils, ++ MAGIC_COMPRESS,MAGIC_SYMLINK,MAGIC_CONTINUE) + from calculate.lib.utils.common import getTupleVersion,cmpVersion + from calculate.lib.utils.device import (detectDeviceForPartition, + getUdevDeviceInfo, countPartitions, +@@ -114,7 +115,7 @@ class Distributive(object): + def fromFile(cls,filename): + """Get Distributive object by filename""" + # MAGIC_COMPRESS 0x000004 Check inside compressed files +- tf = typeFile(magic=0x6) ++ tf = typeFile(magic=MAGIC_COMPRESS|MAGIC_SYMLINK|MAGIC_CONTINUE) + ftype = tf.getMType(filename) + if ftype: + if "block special" in ftype: +@@ -753,7 +754,7 @@ class PartitionDistributive(Distributive): + mulipartDataNotBind = filter(lambda x: x[2]!="bind", + self.getMultipartData()) + for dev, mountPoint, fileSystem, isFormat, partTable\ +- in mulipartDataNotBind: ++ in sorted(mulipartDataNotBind, key=lambda x:x[1]): + if fileSystem!="swap": + realMountPoint = pathJoin(mdirectory, mountPoint) + self._mountPartition(dev,realMountPoint,"-t %s"%fileSystem) +@@ -1095,7 +1096,7 @@ class IsoDistributive(Distributive): + self.compress = compress + + def getType(self): +- tf = typeFile(magic=0x6) ++ tf = typeFile(magic=MAGIC_COMPRESS|MAGIC_SYMLINK|MAGIC_CONTINUE) + ftype = tf.getMType(self.file) + if "block special" in ftype: + return _("live image %s")%self.file +@@ -1116,7 +1117,7 @@ class IsoDistributive(Distributive): + def _mountIso(self,file,directory): + if self.file != self.mdirectory: + self._makeDirectory(directory) +- tf = typeFile(magic=0x6) ++ tf = typeFile(magic=MAGIC_COMPRESS|MAGIC_SYMLINK|MAGIC_CONTINUE) + ftype = tf.getMType(file) + if "block special" in ftype: + mopts = "-o ro" +diff --git install/install.py install/install.py +index fdd6b04..c3e0c7e 100644 +--- install/install.py ++++ install/install.py +@@ -28,7 +28,8 @@ from shutil import copy2 + from calculate.core.server.func import safetyWrapper + from calculate.lib.utils.files import (runOsCommand,pathJoin, + isMount,process,listDirectory,STDOUT, +- checkUtils,readFile,find,copyWithPath) ++ checkUtils,readFile,find,copyWithPath, ++ readLinesFile) + from calculate.lib.utils.common import (appendProgramToEnvFile, + removeProgramToEnvFile, getTupleVersion, + cmpVersion,getUserPassword, +@@ -350,7 +351,7 @@ class Install: + newModuleName = defaultGL + curModuleName = map(lambda x:x.strip().rpartition('=')[-1].strip('"\''), + filter(lambda x: x.startswith("OPENGL_PROFILE="), +- readFile(openGLenv))) ++ readLinesFile(openGLenv))) + curModuleName = curModuleName[-1] if curModuleName else "" + if curModuleName == newModuleName: + return True +diff --git install/variables/audio.py install/variables/audio.py +index 0243ec3..5dc7a1c 100644 +--- install/variables/audio.py ++++ install/variables/audio.py +@@ -33,13 +33,12 @@ class VariableOsAudioData(ReadonlyTableVariable): + 'os_audio_name'] + + def get(self,hr=False): +- alsaInfo = getProgPath('/usr/bin/alsa-info') +- if not alsaInfo: ++ data = readFile('/proc/asound/cards') ++ cards = re.findall('^\s*(\d+).*\n\s+(\S.*) at .*$',data,re.M) ++ if cards: ++ return map(list, cards) ++ else: + return [[]] +- entry = re.compile('^Card hw:(\d+)\s*[^/]+/\'(.*?) at .*$') +- return tuple(map(lambda x:x.groups(), +- filter(None,map(entry.search, +- process(alsaInfo,'--stdout',envdict=os.environ))))) + + setValue = Variable.setValue + +diff --git install/variables/disk.py install/variables/disk.py +index ef0f9e2..c950ec3 100644 +--- install/variables/disk.py ++++ install/variables/disk.py +@@ -31,7 +31,7 @@ from calculate.lib.utils.device import (getUdevDeviceInfo,getDeviceType, + getUUIDDict,getCommonDeviceName) + from calculate.install.variables.autopartition import Sizes + from calculate.lib.utils.files import (listDirectory,pathJoin,readFile,FStab, +- isMount) ++ isMount,getProgPath) + from calculate.install.distr import PartitionDistributive + from calculate.install.fs_manager import FileSystemManager + +@@ -110,7 +110,8 @@ class VariableOsDeviceDev(ReadonlyVariable,DeviceHelper): + """Get device /dev name""" + if self.master is None: + self.master,slave = pty.openpty() +- self.monitor = Popen(["/sbin/udevadm","monitor","--kernel", ++ udevAdm = getProgPath('/sbin/udevadm') ++ self.monitor = Popen([udevAdm,"monitor","--kernel", + "--subsystem-match=block"],stdout=slave, + close_fds=True) + os.close(slave) +@@ -213,7 +214,12 @@ class VariableOsDeviceTable(ReadonlyVariable): + listDirectory(syspath)) + if childs: + child = pathJoin(syspath,childs[0]) +- return getUdevDeviceInfo(path=child).get('ID_PART_ENTRY_SCHEME','') ++ udevinfo = getUdevDeviceInfo(path=child) ++ map_names = {'mbr':'dos', ++ 'msdos':'dos'} ++ table = (udevinfo.get('ID_PART_ENTRY_SCHEME','') or ++ udevinfo.get('UDISKS_PARTITION_SCHEME','')) ++ return map_names.get(table,table) + return "" + + def get(self): +@@ -1834,7 +1840,7 @@ class VariableOsInstallFstabMountConf(ReadonlyVariable,DeviceHelper): + 'os_install_disk_mount', + 'os_install_disk_format', + 'os_install_disk_options', +- 'os_disk_dev'], ++ 'os_install_disk_dev'], + where='os_install_disk_mount', + func=lambda x:x[0] != "" and x[0] != "swap"), + lambda x,y: cmp(self.separateDevice(x[1]), +diff --git install/variables/kernel.py install/variables/kernel.py +index 2e844ac..6fa1bd7 100644 +--- install/variables/kernel.py ++++ install/variables/kernel.py +@@ -19,7 +19,8 @@ import sys + import re + from os import path + from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable +-from calculate.lib.utils.files import typeFile,process,listDirectory ++from calculate.lib.utils.files import ( ++ typeFile,process,listDirectory,MAGIC_SYMLINK,MAGIC_COMPRESS) + + from calculate.lib.cl_lang import setLocalTranslate + setLocalTranslate('cl_install3',sys.modules[__name__]) +@@ -137,8 +138,10 @@ class KernelHelper: + def getFilesByType(self,pathname,descr): + """Get files from "pathname" has "descr" in descriptions""" + filelist = map(lambda x:path.join(pathname,x),os.listdir(pathname)) +- ftype = typeFile(magic=0x4).getMType +- filesWithType = map(lambda x:(x,ftype(x)), filelist) ++ ftype = typeFile(magic=MAGIC_COMPRESS|MAGIC_SYMLINK).getMType ++ filesWithType = map(lambda x:(x,ftype(x)), ++ filter(path.exists, ++ filelist)) + return filter(lambda x:descr in x[1],filesWithType) + + def getInitrd(self,arch,shortname,chroot,kernel,suffix="",notsuffix=""): +@@ -150,7 +153,7 @@ class KernelHelper: + return resInitrdVer.groups()[1] + return "" + +- ftype = typeFile(magic=0x4).getMType ++ ftype = typeFile(magic=MAGIC_COMPRESS|MAGIC_SYMLINK).getMType + kernelfile = path.join(chroot,'boot',kernel) + typeKernelFile = ftype(kernelfile) + if typeKernelFile == None: +diff --git install/variables/net.py install/variables/net.py +index d8d22f6..a07cfe3 100644 +--- install/variables/net.py ++++ install/variables/net.py +@@ -34,6 +34,7 @@ from calculate.lib.utils import ip + from calculate.lib.utils.portage import isPkgInstalled + from operator import itemgetter + from itertools import * ++from functools import partial + import hashlib + from calculate.install.distr import DistributiveError + +@@ -92,26 +93,39 @@ class VariableOsInstallNetInterfacesOrig(NetHelper,ReadonlyVariable): + """ + type = "list" + ++ def is_classic_interface_name(self): ++ hashsum = lambda x: hashlib.md5(readFile(x)).digest() ++ chroot_path = self.Get('cl_chroot_path') ++ etc_path_join = partial(path.join, ++ chroot_path, 'etc/udev/rules.d') ++ lib_path_join = partial(path.join, ++ chroot_path, 'lib/udev/rules.d') ++ udev_files = ('70-persistent-net.rules', ++ '80-net-name-slot.rules', ++ '80-net-setup-link.rules') ++ for etc_file, lib_file in izip(map(etc_path_join,udev_files), ++ map(lib_path_join,udev_files)): ++ if path.exists(etc_file) and hashsum(etc_file) != hashsum(lib_file): ++ return True ++ return False ++ + def get(self): +- chrootPath = self.Get('cl_chroot_path') +- pathOldUdevNet = path.join(chrootPath, +- 'etc/udev/rules.d/70-persistent-net.rules') +- pathNewUdevNet = path.join(chrootPath, +- 'etc/udev/rules.d/80-net-name-slot.rules') +- pathOrigUdevNet = path.join(chrootPath, +- 'lib/udev/rules.d/80-net-name-slot.rules') +- if path.exists(pathOldUdevNet) or \ +- (path.exists(pathNewUdevNet) and +- hashlib.md5(readFile(pathNewUdevNet)).digest() != \ +- hashlib.md5(readFile(pathOrigUdevNet)).digest()): ++ if self.is_classic_interface_name(): + return self.Get('os_install_net_interfaces') + def getOrig(x): + try: +- nameParam = filter(lambda x:x.startswith("ID_NET_NAME_PATH="), +- process("udevadm","test-builtin","net_id", +- "/sys/class/net/%s"%x)) ++ nameParam = \ ++ map(lambda x:x.partition('=')[::2], ++ filter(lambda x:x.startswith("ID_NET_NAME_PATH=") or ++ x.startswith("ID_NET_NAME_ONBOARD="), ++ process("udevadm","test-builtin","net_id", ++ "/sys/class/net/%s"%x))) + if nameParam: +- return nameParam[0].partition('=')[2].strip() or x ++ sortOrder = {'ID_NET_NAME_PATH':0, ++ 'ID_NET_NAME_ONBOARD':1} ++ nameParam = sorted(nameParam, ++ key=lambda x:sortOrder.get(x[0],-1)) ++ return nameParam[-1][1].strip() or x + except Exception as e: + print str(e) + return x +@@ -783,3 +797,24 @@ class VariableOsInstallNetSettings(NetHelper,Variable): + + def choice(self): + return [("","")]+self.Get('os_install_net_conf_available') ++ ++class VariableOsInstallPxeIp(Variable): ++ """ ++ IP адрес PXE сервера ++ """ ++ type = "choice" ++ opt = ["--ip"] ++ metavalue = "IP" ++ ++ def init(self): ++ self.label = _("PXE server IP") ++ self.help = "set IP address for PXE server" ++ ++ def get(self): ++ for ipaddr in ifilter(None, self.Get('os_install_net_ip')): ++ return ipaddr ++ else: ++ return "" ++ ++ def choice(self): ++ return filter(None, self.Get('os_install_net_ip')) +diff --git install/variables/system.py install/variables/system.py +index a9193b6..69e800e 100644 +--- install/variables/system.py ++++ install/variables/system.py +@@ -86,8 +86,6 @@ class VariableOsFormatUse(ReadonlyVariable): + 'value': "off"} + + def checkFunc(self,fs): +- if fs == "btrfs" and self.Get('os_root_type') == 'livecd': +- return "no" + if "format" in FileSystemManager.supportFS[fs] and \ + path.exists(FileSystemManager.supportFS[fs]["format"]): + return "yes" +@@ -656,6 +654,10 @@ class VariableOsInstallGrubTerminal(Variable): + 'etc/default/grub') + if getValueFromConfig(grubDefault,'GRUB_TERMINAL') == 'console': + return 'console' ++ grubCfg = '/boot/grub/grub.cfg' ++ if re.search('^terminal_output\s*console',readFile(grubCfg),re.M): ++ return 'console' ++ + return 'gfxterm' + + def choice(self): +diff --git install/wsdl_install.py install/wsdl_install.py +index 511e16c..c9cab5b 100644 +--- install/wsdl_install.py ++++ install/wsdl_install.py +@@ -94,8 +94,6 @@ class Wsdl(WsdlBase): + expert=('cl_install_home_crypt_set',), + hide=('cl_migrate_data',), + brief=('cl_migrate_user',)), +- lambda group:group(_("Audio"), +- normal=('os_audio_default',)), + lambda group:group(_("Video"), + normal=('os_install_x11_video_drv','os_install_x11_composite', + 'os_install_x11_resolution','os_install_fb_resolution', +@@ -150,29 +148,9 @@ class Wsdl(WsdlBase): + 'groups':[ + lambda group:group(_("PXE install"), + normal=('cl_image_filename',), +- expert=('os_install_pxe_path',), ++ expert=('os_install_pxe_path', ++ 'os_install_pxe_ip'), + next_label=_("Install"))]}, +- # настройка аудио +- { +- 'method_name':"setup_audio", +- 'category':__("Configuration"), +- 'title':__("Audio"), +- 'image':'audio-card', +- 'command':'cl-setup-audio', +- 'gui':True, +- 'rights':['setupaudio'], +- 'logic':{'Install':install.Install}, +- 'action':ClSetupAudioAction, +- 'datavars':"install", +- 'native_error':(VariableError,DataVarsError,install.InstallError), +- 'setvars':{'cl_action!':'merge','cl_merge_pkg!':[None], +- 'cl_merge_set!':"on",'cl_setup':'audio'}, +- 'groups':[ +- lambda group:group(_("Audio"), +- normal=('os_audio_default',), +- expert=('cl_templates_locate',"cl_dispatch_conf","cl_verbose_set"), +- next_label=_("Save"))]}, +- { + # настройка загрузки системы + 'method_name':"setup_boot", + 'category':__("Configuration"), diff --git a/sys-apps/calculate-utilities/Manifest b/sys-apps/calculate-utilities/Manifest index 4c955fa55..9af81c267 100644 --- a/sys-apps/calculate-utilities/Manifest +++ b/sys-apps/calculate-utilities/Manifest @@ -52,6 +52,7 @@ EBUILD calculate-utilities-3.1.9-r3.ebuild 758 SHA256 7bdb0132b728c1a0b8ea57f0ea EBUILD calculate-utilities-3.1.9-r30.ebuild 772 SHA256 74f0dbee3c66b1bc7c5ec1eeab7699bae12fa11ceff6d4b291e807e9a6448a6c SHA512 f3fe56540bd34441c584e4de6b1d8d454216f52a17b9d734a2449b76a3adfb59cd76ebc965bc4b6bf56d9e3a02506bcf65c7b7a00aeb32230d842cd3a9488651 WHIRLPOOL 1f14d760abd5adbba43857deda0db4e8b2ac589c71d555753b9f4f1d74c323624deed95d9b174347d1d659559fad12b0e3ccb6ae202240a383782efd583217ed EBUILD calculate-utilities-3.1.9-r31.ebuild 772 SHA256 69b6dd7ebab0bcf94c5ea834faf69ad7f95d1510b70c2d610ccc8f80da7f01b6 SHA512 91e0e48849c1b6a98dfc66ef2b6a4c5ab03541cf17b0db4481c0228c15a911e34adbad26effed644be18efa77c280b85232f8c3c5213ec2c84a7ba2dcb5e637c WHIRLPOOL 10fd623c624f0b11328696c42dbae4d977463d9b8823ba54040ea1e384b29b33815b99e507f02a10d3162787eba418098c7e1efaf529a4345068c6ef976c4748 EBUILD calculate-utilities-3.1.9-r32.ebuild 772 SHA256 5a81043a16dd6a9685da194cc0d6aed807681137c3f16b494e91c076d0692fef SHA512 59b7b65287f83d47f64bf326c948b726061be848c72e634f814ff15015bf2cdbeec804a4c6c8a5342937a473002bac38729749b94488d09cc414bf0015b23385 WHIRLPOOL 526ec1cd03cf56a9574c7cbd93254d406967680e2e5ea17e426de6e1143c8cd148c6e45ddc86e05f2e6ac58fa4dfc3b17af13a05b9157bc5ca8616c564bef4ca +EBUILD calculate-utilities-3.1.9-r33.ebuild 772 SHA256 b885f333777762471eb3c960c796837c7fbc310e4d2080bd9f2a2542badbd11a SHA512 0d475a24f1b3da8d7bfb6f26a16a51211b628166956d12e76d4441a7e813a578b1eb91be690ad0f18fab179a8c39ef4fbfc0ccfa485c231bbd4f8cfed14fb01a WHIRLPOOL 587386674840ebdeb73b1e346b821add74035c1f01c44669b029457db7ab5c8b3d2fc4bdf73e36045b3ab855fe39dc3594882a3f3c12019569e86846727ec6a9 EBUILD calculate-utilities-3.1.9-r4.ebuild 761 SHA256 14ec84c6cad91bc692b12b8ba2f3f78698f76a1570faf6cbf84f644aac6baecf SHA512 a51fa4a937eb13eb6ad7048f68e86903fcdbf37531668def216a3f745c253e353b5f893e91982bc16c874bfe82146dea2165c24ef26a9a28164923a772b72f40 WHIRLPOOL 4b185030c44756d36afda759a4d5f83156b42c7b9378f4045ba5cb9cbd3e9a1f1cb337184d642be9f844962fbfe4aa1d40086c07226b8688b7ea1e1078301845 EBUILD calculate-utilities-3.1.9-r5.ebuild 761 SHA256 a6ddc522be5784c19c22e360f17c5c1149f92c7c23eabe724a00d0b20be9424d SHA512 2b8d02937095edfb747926d11140a2cc44ee266668b9b830dba86efe149e03b4cc0eeea662e2c2c299f58039de70c8dec089422e9636470a6e7039f5dd7752ab WHIRLPOOL 391954432a980cbaddf39ba75a65483067941f62375e2d955820525c8f0513e3b8c766dd377b28f4cb3d52aaab4fbb447ee2093f6bd60b39cac27973887d6b3e EBUILD calculate-utilities-3.1.9-r6.ebuild 761 SHA256 6a80651696c1ffd3db424485b5bc840eca5cb508b52696cb3938c2bb25601b0d SHA512 9b61841e4a6c5b56bf54c47bdc0e403cb7156ac8ff6b4d0af5988eb13005cebe22beffd5f747d7f61eb87e372b7d5b35d9252dc4892dbc9ed5e4230888b7f726 WHIRLPOOL 1063ebcae15a79d20073dabf8b141b873e2e86f865fd9a50dd8d0e859e4ba7ff99de76e7d5ba3de668eb4b499ea32af59ee6502e6f2d832476062d14b8e49e61 diff --git a/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r33.ebuild b/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r33.ebuild new file mode 100644 index 000000000..49a0a7cb1 --- /dev/null +++ b/sys-apps/calculate-utilities/calculate-utilities-3.1.9-r33.ebuild @@ -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.9-r15 + =sys-apps/calculate-i18n-3.1.9 + =sys-apps/calculate-lib-3.1.9-r14 + =sys-apps/calculate-core-3.1.9-r4 + =sys-apps/calculate-update-3.1.9 + cl_client? ( =sys-apps/calculate-client-3.1.9-r3 ) + cl_desktop? ( =sys-apps/calculate-desktop-3.1.9-r4 ) + cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.9-r1 ) + cl_console? ( =sys-apps/calculate-console-3.1.9-r1 ) +"