parent
f582e87328
commit
8802d50659
@ -0,0 +1,31 @@
|
||||
# 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-install-2.2.23
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.23-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 0fc4d6e..ad792c3 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -786,3 +786,12 @@ class cl_builder(color_print):
|
||||
self.printERROR(_("'{0}' is not supported by {1}")\
|
||||
.format(compress,"squashfs"))
|
||||
return False
|
||||
+
|
||||
+ def setLive(self,live):
|
||||
+ """Set variable for activate patch init.d/calculate:
|
||||
+
|
||||
+ discard --live from cl-install --startup"""
|
||||
+ if live:
|
||||
+ self.clVars.Set('cl_builder_live_set',"on",True)
|
||||
+ else:
|
||||
+ self.clVars.Set('cl_builder_live_set',"off",True)
|
||||
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
|
||||
index c7d7332..98692a4 100644
|
||||
--- pym/cl_image_cmd.py
|
||||
+++ pym/cl_image_cmd.py
|
||||
@@ -58,6 +58,9 @@ CMD_OPTIONS = [{'shortOption':"p",
|
||||
{'longOption':'notree',
|
||||
'help':_("exclude portage tree from image")
|
||||
},
|
||||
+ {'longOption':'live',
|
||||
+ 'help':_("use only live templates on startup")
|
||||
+ },
|
||||
{'longOption':'noisohybrid',
|
||||
'help':_("create iso image without isohybrid")
|
||||
},
|
||||
@@ -146,6 +149,8 @@ class image_cmd(share_cmd):
|
||||
if not self.logicObj.setCompression(values.compress):
|
||||
sys.exit(1)
|
||||
|
||||
+ self.logicObj.setLive(values.live)
|
||||
+
|
||||
if not self.isScratch(False) \
|
||||
and self.logicObj.clVars.Get('cl_builder_distro'):
|
||||
if not self.logicObj.setAssembleData(values.p,values.v):
|
||||
diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
|
||||
index d4e621c..93bb908 100644
|
||||
--- pym/cl_vars_builder.py
|
||||
+++ pym/cl_vars_builder.py
|
||||
@@ -153,6 +153,7 @@ class Data:
|
||||
# path which contains images
|
||||
cl_builder_image_path = {}
|
||||
|
||||
+ cl_builder_live_set = {}
|
||||
# lib vars
|
||||
cl_chroot_path = {}
|
||||
cl_env_path = {}
|
||||
@ -0,0 +1,33 @@
|
||||
# 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 assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-2.2.19
|
||||
!<sys-apps/calculate-install-2.2.19
|
||||
!<sys-apps/calculate-client-2.2.19
|
||||
!<sys-apps/calculate-desktop-2.2.19
|
||||
!<sys-apps/calculate-builder-2.2.19
|
||||
!<sys-apps/calculate-assemble-2.2.19"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-i18n-2.2.23-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="Templates for calculate utilities 2.2"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-2.2.23"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# Add '--live' option
|
||||
epatch "${FILESDIR}/calculate-templates-2.2.23-r1.patch"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
:
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodir /usr/share/calculate/templates
|
||||
insinto /usr/share/calculate/templates
|
||||
doins -r *
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
diff --git builder/squash/etc/init.d/calculate builder/squash/etc/init.d/calculate
|
||||
new file mode 100644
|
||||
index 0000000..35c0c98
|
||||
--- /dev/null
|
||||
+++ builder/squash/etc/init.d/calculate
|
||||
@@ -0,0 +1,3 @@
|
||||
+# Calculate format=patch cl_builder_live_set==off
|
||||
+<reg>LANG=C /usr/bin/cl-install --startup --live</reg>
|
||||
+<text>LANG=C /usr/bin/cl-install --startup</text>
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2011 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_installgui
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-2.2.23
|
||||
=sys-apps/calculate-templates-2.2.23-r1
|
||||
=sys-apps/calculate-lib-2.2.23
|
||||
=sys-apps/calculate-i18n-2.2.23-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.23 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.23-r1 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.23 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.23 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.23 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
Loading…
Reference in new issue