parent
55d876e4c8
commit
21bbd7734f
@ -0,0 +1,5 @@
|
|||||||
|
# Calculate comment=# format=samba
|
||||||
|
[main]
|
||||||
|
cl_autoupdate_set = on
|
||||||
|
cl_merges = calculate-install
|
||||||
|
cl_template_path = /var/lib/layman/calculate/profiles/templates
|
@ -1,5 +1,9 @@
|
|||||||
# Calculate path=/tmp pkg(x11-base/xorg-server)!=&&os_root_type==livecd name=reconfigureXorg exec=/bin/bash
|
# Calculate path=/tmp pkg(x11-base/xorg-server)!=&&os_root_type==livecd name=reconfigureXorg exec=/bin/bash
|
||||||
|
|
||||||
# reconfigure conf.d/xdm after undomain action on livecd
|
# reconfigure conf.d/xdm after undomain action on livecd
|
||||||
|
|
||||||
cl-template -l all --merge x11-base/xorg-server &>/dev/null
|
cl-template -l all --merge x11-base/xorg-server &>/dev/null
|
||||||
|
#?pkg(sys-apps/calculate-install)>=3.0.0_beta2#
|
||||||
|
cl-core --method core_setup --pkg-name=xorg-server &>/dev/null
|
||||||
|
#pkg#
|
||||||
true
|
true
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
# Calculate path=/tmp exec=/bin/bash ac_install_system!=up&&pkg(sys-apps/calculate-utilities)>=3.0.0_beta2
|
||||||
|
|
||||||
|
/usr/sbin/cl-core --create-symlink
|
||||||
|
true
|
@ -0,0 +1,37 @@
|
|||||||
|
# Copyright 1999-2011 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/calculate2/${PN}/${P}.tar.bz2"
|
||||||
|
|
||||||
|
DESCRIPTION="The utilities for builder tasks of Calculate Linux"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="amd64 x86"
|
||||||
|
|
||||||
|
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||||
|
!<sys-apps/calculate-1.4.0_p20100921
|
||||||
|
app-cdr/cdrkit
|
||||||
|
sys-fs/squashfs-tools"
|
||||||
|
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_unpack() {
|
||||||
|
unpack "${A}"
|
||||||
|
cd "${S}"
|
||||||
|
|
||||||
|
# fix get value from variable
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_init.d.patch"
|
||||||
|
|
||||||
|
# fix urandom remove func
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_urandom.patch"
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_urandom2.patch"
|
||||||
|
|
||||||
|
# fix grub configuring
|
||||||
|
epatch "${FILESDIR}/calculate-builder-2.2.29-fix_grub_config.patch"
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
commit f904ae0aa3925665a112011e8f8729bfb02ff1e9
|
||||||
|
Author: Mike Hiretsky <mh@calculate.ru>
|
||||||
|
Date: Tue Jun 26 16:33:36 2012 +0400
|
||||||
|
|
||||||
|
Fix grub configuration
|
||||||
|
|
||||||
|
diff --git a/pym/cl_kernel.py b/pym/cl_kernel.py
|
||||||
|
index b5f37cb..9dccc2b 100644
|
||||||
|
--- a/pym/cl_kernel.py
|
||||||
|
+++ b/pym/cl_kernel.py
|
||||||
|
@@ -22,12 +22,11 @@ import traceback
|
||||||
|
from os import path
|
||||||
|
from cl_builder import DataVarsBuilder, printNoColor, __version__, __app__
|
||||||
|
from cl_utils import process,listDirectory,cmpVersion,reVerSplitToPV, \
|
||||||
|
- reVerSplit,getPkgInstalled
|
||||||
|
+ reVerSplit,getPkgInstalled,PIPE,STDOUT
|
||||||
|
from cl_vars_share import varsShare
|
||||||
|
from subprocess import STDOUT,PIPE
|
||||||
|
from cl_print import color_print
|
||||||
|
from shutil import copy2 as copy_with_perm
|
||||||
|
-from cl_apply_template import updateConfFiles
|
||||||
|
|
||||||
|
from cl_kernel_utils import KernelConfig,InitRamFs
|
||||||
|
|
||||||
|
@@ -402,8 +401,9 @@ class cl_kernel(color_print):
|
||||||
|
# if has grub2
|
||||||
|
if filter(lambda x:x.startswith("grub-1.99"),
|
||||||
|
listDirectory('/var/db/pkg/sys-boot')):
|
||||||
|
- clTemplate = updateConfFiles()
|
||||||
|
- clTemplate.applyAllTemplates(package="grub")
|
||||||
|
+ grubInstall = process('/usr/sbin/cl-core','--method','core_setup',
|
||||||
|
+ '--pkg-name','grub',stderr=None)
|
||||||
|
+ grubInstall.success()
|
||||||
|
|
||||||
|
if not filter(lambda x:x.startswith("grub-0.9"),
|
||||||
|
listDirectory('/var/db/pkg/sys-boot')) or not path.exists(grubconf):
|
@ -0,0 +1,21 @@
|
|||||||
|
# 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="Qt gui console client for WSDL Calculate 3"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
|
DEPEND="~sys-apps/calculate-core-3.0.0_beta2
|
||||||
|
dev-python/dbus-python
|
||||||
|
dev-python/imaging
|
||||||
|
dev-python/pyside[script]"
|
||||||
|
RDEPEND="${DEPEND}"
|
@ -0,0 +1,18 @@
|
|||||||
|
# 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="Console client for WSDL Calculate 3"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
|
DEPEND="~sys-apps/calculate-core-3.0.0_beta2"
|
||||||
|
RDEPEND="${DEPEND}"
|
@ -0,0 +1,35 @@
|
|||||||
|
# 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_beta2
|
||||||
|
>=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}"
|
||||||
|
|
||||||
|
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"
|
||||||
|
}
|
@ -0,0 +1,20 @@
|
|||||||
|
# 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 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.0.0_beta2"
|
||||||
|
|
||||||
|
DEPEND="sys-devel/gettext
|
||||||
|
${DEPEND}"
|
@ -0,0 +1,40 @@
|
|||||||
|
# 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_beta2
|
||||||
|
!<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}"
|
||||||
|
|
||||||
|
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,25 @@
|
|||||||
|
# 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 library for Calculate 3"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="3"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="minimal"
|
||||||
|
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||||
|
>=dev-python/pyxml-0.8
|
||||||
|
sys-apps/iproute2
|
||||||
|
sys-apps/pciutils
|
||||||
|
sys-fs/lvm2
|
||||||
|
sys-fs/mdadm
|
||||||
|
dev-python/pyinotify
|
||||||
|
sys-apps/file[python]"
|
||||||
|
RDEPEND="${DEPEND}"
|
@ -0,0 +1,34 @@
|
|||||||
|
# Copyright 1999-2012 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
# $Header: $
|
||||||
|
|
||||||
|
EAPI=3
|
||||||
|
|
||||||
|
DESCRIPTION="Calculate Utilities meta package"
|
||||||
|
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||||
|
SRC_URI=""
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="amd64 x86"
|
||||||
|
IUSE="
|
||||||
|
cl_assemble
|
||||||
|
cl_builder
|
||||||
|
cl_client
|
||||||
|
cl_desktop
|
||||||
|
cl_server
|
||||||
|
"
|
||||||
|
|
||||||
|
RDEPEND="${RDEPEND}
|
||||||
|
!sys-apps/calculate-templates
|
||||||
|
!<sys-apps/calculate-install-3.0.0_alpha1
|
||||||
|
=sys-apps/calculate-lib-2.2.29-r2
|
||||||
|
=sys-apps/calculate-i18n-2.2.29
|
||||||
|
|
||||||
|
cl_assemble? ( =sys-apps/calculate-assemble-2.2.29-r1 )
|
||||||
|
cl_builder? ( =sys-apps/calculate-builder-2.2.29-r6 )
|
||||||
|
cl_client? ( =sys-apps/calculate-client-2.2.29 )
|
||||||
|
cl_desktop? ( =sys-apps/calculate-desktop-2.2.29 )
|
||||||
|
|
||||||
|
cl_server? ( =sys-apps/calculate-server-2.1.15-r6 )
|
||||||
|
"
|
@ -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_beta2
|
||||||
|
=sys-apps/calculate-i18n-3.0.0_beta2
|
||||||
|
=sys-apps/calculate-lib-3.0.0_beta2
|
||||||
|
=sys-apps/calculate-core-3.0.0_beta2
|
||||||
|
cl_consolegui? ( =sys-apps/calculate-console-gui-3.0.0_beta2 )
|
||||||
|
cl_console? ( =sys-apps/calculate-console-3.0.0_beta2 )
|
||||||
|
"
|
||||||
|
|
Loading…
Reference in new issue