parent
45ccc72168
commit
c7de0c7d96
@ -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.27
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix rescratch, change update portage
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.27-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 8070896..a14c8ff 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -140,7 +140,7 @@ class cl_builder(color_print):
|
||||
#self.clVars.Set("cl_root_path","/", True)
|
||||
self.clVars.Set("cl_action","iso", True)
|
||||
chrootPath=pathJoin(directory,
|
||||
- self.clVars.Get('cl_builder_squash_path'))
|
||||
+ self.clVars.Get('cl_builder_squash_path'))
|
||||
self.clVars.Set("cl_chroot_path",chrootPath, True)
|
||||
self.clVars.Set("cl_root_path","..", True)
|
||||
self.clTempl = template(self.clVars)
|
||||
@@ -254,35 +254,28 @@ class cl_builder(color_print):
|
||||
raise BuilderError(_("Failed to unmount %s")%target)
|
||||
self.printByResult(True)
|
||||
distrPath = distr.convertToDirectory().getDirectory()
|
||||
+ self.clVars.Set('cl_builder_squash_path',
|
||||
+ os.path.basename(os.path.normpath(distrPath)))
|
||||
self.cleanNeedlessKernelData(distrPath)
|
||||
self.dispatchConf(distrPath)
|
||||
|
||||
+ builderPath = self.clVars.Get('cl_builder_path')
|
||||
if self.assembleIso and \
|
||||
self.clVars.Get('os_builder_profile').endswith('binary'):
|
||||
- self.printMessageForTest(_("Updating calculate overlay"))
|
||||
- updateLayman = self.runChroot(distrPath,"layman -s calculate")
|
||||
- self.printByResult(updateLayman.success())
|
||||
-
|
||||
- self.printByResult(True)
|
||||
-
|
||||
- builderPath = self.clVars.Get('cl_builder_path')
|
||||
- updateMeta = False
|
||||
- for gitName,gitDir in (('portage','/usr/portage'),
|
||||
- ('overlay','/var/lib/layman/calculate')):
|
||||
- gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
|
||||
- if "heads/develop" in readFile(gitHead):
|
||||
- self.printMessageForTest(
|
||||
- _("Changing {repname} repository branch to '{branch}'").
|
||||
- format(repname=gitName,
|
||||
- branch='master'))
|
||||
- changeBranch = self.runChroot(distrPath,
|
||||
- "cd %s;git fetch;git checkout master;git pull"%gitDir)
|
||||
- self.printByResult(changeBranch.success())
|
||||
- updateMeta = True
|
||||
-
|
||||
- if updateMeta:
|
||||
- self.printMessageForTest(_("Updating portage metadata"))
|
||||
- updateMeta = self.runChroot(distrPath,"emerge --metadata")
|
||||
+ for gitName,gitDir in (('portage','/usr/portage'),
|
||||
+ ('overlay','/var/lib/layman/calculate')):
|
||||
+ gitHead = pathJoin(builderPath,gitDir,".git/HEAD")
|
||||
+ if "heads/develop" in readFile(gitHead):
|
||||
+ self.printMessageForTest(
|
||||
+ _("Changing {repname} repository branch to '{branch}'").
|
||||
+ format(repname=gitName,
|
||||
+ branch='master'))
|
||||
+ changeBranch = self.runChroot(distrPath,
|
||||
+ "cd %s;git fetch;git checkout master"%gitDir)
|
||||
+ self.printByResult(changeBranch.success())
|
||||
+
|
||||
+ self.printMessageForTest(_("Updating portage"))
|
||||
+ updateMeta = self.runChroot(distrPath,"emerge --sync")
|
||||
self.printByResult(updateMeta.success())
|
||||
|
||||
self.applyTemplatesForSquash(distrPath)
|
||||
@ -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.27-r3
|
||||
=sys-apps/calculate-templates-2.2.27-r5
|
||||
=sys-apps/calculate-lib-2.2.27-r3
|
||||
=sys-apps/calculate-i18n-2.2.27-r2
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.27 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.27-r3 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.27-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.27 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.27 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.15-r4 )
|
||||
"
|
||||
Loading…
Reference in new issue