parent
dcb5280e37
commit
b4cf13435f
@ -0,0 +1,51 @@
|
||||
# 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-lib-3.0.1
|
||||
!<sys-apps/calculate-install-2.2.29
|
||||
app-portage/layman
|
||||
!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}"
|
||||
|
||||
# changes
|
||||
epatch "${FILESDIR}/calculate-install-3.0.1-fix_pxe_loading.patch"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For install wsdl for calculate-install perform:"
|
||||
einfo " cl-core --append-variable cl_wsdl=calculate-install"
|
||||
einfo " cl-core --append-variable cl_merges=calculate-install"
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index 9b3c784..ea32c87 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -124,7 +124,11 @@ start() {
|
||||
|
||||
# reinit net.* services
|
||||
local roottype=`variable_value os_root_type`
|
||||
- [[ $roottype == "livecd" ]] && udevadm trigger --action="add" --subsystem-match=net
|
||||
+ if [[ $roottype == "livecd" ]]
|
||||
+ then
|
||||
+ touch /* /bin/* /sbin/*
|
||||
+ udevadm trigger --action="add" --subsystem-match=net
|
||||
+ fi
|
||||
|
||||
/sbin/rc-update --update
|
||||
return 0
|
||||
diff --git install/fs_manager.py install/fs_manager.py
|
||||
index 7892e35..f3f7a62 100644
|
||||
--- install/fs_manager.py
|
||||
+++ install/fs_manager.py
|
||||
@@ -100,14 +100,14 @@ class FileSystemManager:
|
||||
'msdos': '0b',
|
||||
'type':['flash']},
|
||||
'ntfs': {'defaultopt': defaultOpt,
|
||||
- 'format': '/sbin/mkfs.ntfs',
|
||||
+ 'format': '/usr/sbin/mkfs.ntfs',
|
||||
'formatparam': '{labelparam} -FQ {device}',
|
||||
'gpt': '0700',
|
||||
'label': '-L {labelname}',
|
||||
'msdos': '7',
|
||||
'compatible':['ntfs-3g']},
|
||||
'ntfs-3g': {'defaultopt': defaultOpt,
|
||||
- 'format': '/sbin/mkfs.ntfs',
|
||||
+ 'format': '/usr/sbin/mkfs.ntfs',
|
||||
'formatparam': '{labelparam} -FQ {device}',
|
||||
'gpt': '0700',
|
||||
'label': '-L {labelname}',
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 8a9b8e6..f9d91e2 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -999,6 +999,8 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
|
||||
return map(self.defaultPerformFormat(),
|
||||
zip(source,mount,fs,value))
|
||||
|
||||
+ fixNtfs = lambda self,x:{'ntfs-3g','ntfs'}.get(x,x)
|
||||
+
|
||||
def check(self,value):
|
||||
"""Check perform format
|
||||
|
||||
@@ -1017,9 +1019,11 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
|
||||
unavailFS = set(self.Select('os_format_type',
|
||||
where='os_format_use',
|
||||
eq="off"))
|
||||
+ fixNtfs = self.fixNtfs
|
||||
for dev,mp,fs,isformat in info:
|
||||
# should format if change fs or partition is root, but non flash
|
||||
- partitionMustFormat = diskFormat.get(dev,fs) != fs or \
|
||||
+ partitionMustFormat = \
|
||||
+ fixNtfs(diskFormat.get(dev,fs)) != fixNtfs(fs) or \
|
||||
(mp == '/' and \
|
||||
self.Get('os_install_root_type') != 'flash')
|
||||
# if entry has mount point AND
|
||||
@@ -1067,10 +1071,11 @@ class VariableOsLocationPerformFormat(LocationHelper,Variable):
|
||||
(self.Get('os_disk_format'))))
|
||||
def wrap(info):
|
||||
source,dest,fs,isformat = info
|
||||
+ fixNtfs = self.fixNtfs
|
||||
if not isformat and source.startswith('/dev/'):
|
||||
if dest == '/':
|
||||
return "on"
|
||||
- if dest and diskFormat.get(source,fs) != fs:
|
||||
+ if dest and fixNtfs(diskFormat.get(source,fs)) != fixNtfs(fs):
|
||||
return "on"
|
||||
return isformat or ("off" if source.startswith('/dev/') else "")
|
||||
return wrap
|
||||
@@ -1598,7 +1603,7 @@ class VariableOsInstallFstabMountConf(ReadonlyVariable,DeviceHelper):
|
||||
devicesForFstab = filter(lambda x:x[1] != "/", devicesForFstab)
|
||||
|
||||
# rootLine one string, but it correct work if devicesForFstab is empty
|
||||
- rootLine = "\n".join(map(lambda x: "%s\t%s\t%s\t%s\t0 2" %
|
||||
+ rootLine = "\n".join(map(lambda x: "%s\t%s\t%s\t%s\t0 1" %
|
||||
(self._commentFstab(x[0],x[1],x[4]),x[1],x[2],x[3]),
|
||||
devicesForFstab[:1]))
|
||||
otherLines = "\n".join(map(lambda x: "%s\t%s\t%s\t%s\t0 0" %
|
||||
@ -0,0 +1,24 @@
|
||||
# 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_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.0.1-r2
|
||||
=sys-apps/calculate-i18n-3.0.1
|
||||
=sys-apps/calculate-lib-3.0.1-r1
|
||||
=sys-apps/calculate-core-3.0.1
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.0.1 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue