parent
9c67947cfd
commit
0b1e5b520e
@ -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.2.0_alpha10
|
||||
!<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.2.0_alpha10-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,104 @@
|
||||
diff --git install/utils/cl_setup.py install/utils/cl_setup.py
|
||||
index e4ad417..f70b00a 100644
|
||||
--- install/utils/cl_setup.py
|
||||
+++ install/utils/cl_setup.py
|
||||
@@ -149,7 +149,7 @@ class ClSetupBootAction(ClSetupSystemAction):
|
||||
Get('os_install_scratch') == 'off')
|
||||
},
|
||||
{'name':'no_scratch',
|
||||
- 'warning':_("The builder mode is not longer supported"),
|
||||
+ 'warning':_("The builder mode is no longer supported"),
|
||||
'condition':lambda Get:Get('os_install_scratch') == 'on'
|
||||
},
|
||||
# изменить IO планировщик
|
||||
diff --git install/variables/X11.py install/variables/X11.py
|
||||
index a30d448..836803b 100644
|
||||
--- install/variables/X11.py
|
||||
+++ install/variables/X11.py
|
||||
@@ -37,12 +37,12 @@ class VideoVariable(Variable):
|
||||
"""
|
||||
xorg_need = True
|
||||
default_video = "default"
|
||||
- driver_names = {'nvidia': _("Nvidia proprietary video driver"),
|
||||
- 'fglrx': _("Ati proprietary video driver"),
|
||||
+ driver_names = {'nvidia': _("NVidia proprietary video driver"),
|
||||
+ 'fglrx': _("ATI proprietary video driver"),
|
||||
'intel': _("Intel video driver"),
|
||||
- 'radeon': _("Ati open source video driver"),
|
||||
- 'nouveau': _("Nvidia open source video driver"),
|
||||
- 'default': _("X.Org Server auto-detect")
|
||||
+ 'radeon': _("ATI open source video driver"),
|
||||
+ 'nouveau': _("NVidia open source video driver"),
|
||||
+ 'default': _("X.Org Server auto detection")
|
||||
}
|
||||
|
||||
def uncompatible(self):
|
||||
@@ -183,7 +183,7 @@ class VariableOsInstallX11VideoDrv(VideoVariable):
|
||||
return drv
|
||||
return self.default_video
|
||||
else:
|
||||
- for drv in self.choice():
|
||||
+ for drv in map(lambda x:x[0], self.choice()):
|
||||
videoSysPath = path.join("/sys/module",drv,"refcnt")
|
||||
refcnt = readFile(videoSysPath).strip()
|
||||
if refcnt.isdigit() and int(refcnt) > 0:
|
||||
diff --git install/variables/audio.py install/variables/audio.py
|
||||
index 5dc7a1c..b30cd6c 100644
|
||||
--- install/variables/audio.py
|
||||
+++ install/variables/audio.py
|
||||
@@ -116,5 +116,5 @@ class VariableOsAudioDefault(Variable):
|
||||
return _("Audio configuration unavailable for Flash install")
|
||||
if self.Get('os_install_alsa_set') == 'off':
|
||||
return \
|
||||
- _("This distribution does not provide the alsa sound")
|
||||
+ _("This distribution does not provide the ALSA sound")
|
||||
return ""
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 16505fb..142c3c5 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -236,7 +236,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):
|
||||
@@ -1725,8 +1730,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
raise VariableError(_("You need a disk with a dos "
|
||||
"table for Flash install"))
|
||||
if tableOnBootDisk == "dos" and useBtrfs:
|
||||
- raise VariableError(_("You need a disk with a gpt "
|
||||
- "table for install on btrfs"))
|
||||
+ raise VariableError(_("You need a disk with a GPT table for "
|
||||
+ "install on a btrfs partition"))
|
||||
if rootType in ("usb-hdd","hdd") and tableOnBootDisk == "gpt":
|
||||
efisize = self.Select('os_disk_size',
|
||||
where=['os_disk_id','os_disk_parent'],
|
||||
@@ -1737,15 +1742,15 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
minsize = "%dMb" % (int(bios_grub_size) / Sizes.M)
|
||||
if not efisize:
|
||||
raise VariableError(
|
||||
- _("Boot device must have BIOS Boot "
|
||||
- "partition ({minsize})").format(minsize=minsize))
|
||||
+ _("Your boot device must have a BIOS Boot partition "
|
||||
+ "({minsize})").format(minsize=minsize))
|
||||
# проверка размера EF02 при установке на btrfs
|
||||
elif useBtrfs:
|
||||
if (efisize.isdigit() and bios_grub_size.isdigit() and
|
||||
int(efisize) < int(bios_grub_size)):
|
||||
raise VariableError(
|
||||
- _("Boot device must have BIOS Boot partition "
|
||||
- "({minsize})").format(minsize=minsize))
|
||||
+ _("Your boot device must have a BIOS Boot "
|
||||
+ "partition ({minsize})").format(minsize=minsize))
|
||||
if value:
|
||||
if self.Get('os_grub2_path'):
|
||||
self.checkForGrub2()
|
||||
@ -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.2.0_alpha10-r3
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha10-r4
|
||||
=sys-apps/calculate-lib-3.2.0_alpha10-r5
|
||||
=sys-apps/calculate-core-3.2.0_alpha10-r8
|
||||
=sys-apps/calculate-update-3.2.0_alpha10-r7
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha10-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha10 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha10 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha10-r1 )
|
||||
"
|
||||
Loading…
Reference in new issue