parent
88d0eb16d3
commit
427aca1089
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.0.0_beta4
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
#some fix bug
|
||||
epatch "${FILESDIR}/calculate-core-3.0.0_beta4-r1.patch"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,48 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="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.0_beta4
|
||||
!<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}"
|
||||
|
||||
# locate tamplates
|
||||
epatch "${FILESDIR}/calculate-install-3.0.0_beta4-r1.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,48 @@
|
||||
diff --git data/calculate data/calculate
|
||||
index 4658f4e..9b3c784 100644
|
||||
--- data/calculate
|
||||
+++ data/calculate
|
||||
@@ -101,10 +101,11 @@ configure_users() {
|
||||
for user in $(variable_value cl_migrate_user | sed -r "s/,/ /g")
|
||||
do
|
||||
HOME_DIR=`getent passwd $user | awk -F: '{ print( $6 ); }'`
|
||||
- if [[ $user == "root" ]] || [[ -f $HOME_DIR/.calculate/ini.env ]]
|
||||
+ if [[ -f $HOME_DIR/.calculate/ini.env ]]
|
||||
then
|
||||
cl-desktop $user
|
||||
fi
|
||||
+ cl-desktop root
|
||||
done
|
||||
fi
|
||||
}
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 44ed3f9..a74f737 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -610,6 +610,8 @@ class VariableOsLocationData(LocationHelper,TableVariable):
|
||||
"os_location_perform_format",
|
||||
"os_location_size"]
|
||||
|
||||
+ check_after = ["os_install_root_type"]
|
||||
+
|
||||
def init(self):
|
||||
self.help = _("DISK bound for installation will be mounted to the "
|
||||
"DIR directory. If set to 'none', the mount point will "
|
||||
diff --git install/variables/distr.py install/variables/distr.py
|
||||
index 5aae686..d9af10e 100644
|
||||
--- install/variables/distr.py
|
||||
+++ install/variables/distr.py
|
||||
@@ -242,10 +242,10 @@ class VariableClImage(ReadonlyVariable):
|
||||
|
||||
def get(self):
|
||||
"""Get image file from distributive repository"""
|
||||
- if self.Get('cl_action') != 'system':
|
||||
- return Distributive.fromFile('/')
|
||||
- filename = self.Get('cl_image_filename')
|
||||
try:
|
||||
+ if self.Get('cl_action') != 'system':
|
||||
+ return Distributive.fromFile('/')
|
||||
+ filename = self.Get('cl_image_filename')
|
||||
if filename:
|
||||
filename = Distributive.fromFile(filename)
|
||||
except DistributiveError as e:
|
||||
@ -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.0_beta4-r1
|
||||
=sys-apps/calculate-i18n-3.0.0_beta4
|
||||
=sys-apps/calculate-lib-3.0.0_beta4
|
||||
=sys-apps/calculate-core-3.0.0_beta4-r1
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta4 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.0.0_beta4 )
|
||||
"
|
||||
|
||||
Loading…
Reference in new issue