parent
d5614c930a
commit
61d67f92c7
@ -1,11 +1,13 @@
|
||||
AUX calculate-builder-2.2.24-r1.patch 2551 RMD160 3d01601506bc6178ee5a0ecef3772ceaf41f8f1d SHA1 cdd27e6e4ae567e2bf88023f3cc2e8db0236df38 SHA256 846e60fa3255abad18666bb74f1f9bd253c35224bb4b227abf0640d7477e037c
|
||||
AUX calculate-builder-2.2.24-r2.patch 1058 RMD160 0d0eeaac3ea4d5ebc2cc8e5a54daa11001007d53 SHA1 aefdcd72e494c0b97d4fe0c3891f4a7a60bc452b SHA256 d29c7eb2dd3bdd6ab14add61f4d40ff17a01e5365873a3e63ae5db80d18d8ce2
|
||||
AUX calculate-builder-2.2.24-r3.patch 2530 RMD160 9ae77c0eff7821b14526497c61b101acd8e654d2 SHA1 d96952b30d2b2a94dc94fc28641394b41c1c80b6 SHA256 e2c61e5440632c398d9f5395b225e3ed3fc848dc26093e2d21d95c3569717b03
|
||||
AUX calculate-builder-2.2.24-r4.patch 2924 RMD160 767fe1d3416c27820da427fdb15f1c71525c7c91 SHA1 91854f98a855c5bb67a9f5edc15ad6fed70909af SHA256 eccbf5d5fcbfbdd436ae14ae01063d5d0934a2cf7e0b53a985a1d86fb21672b6
|
||||
DIST calculate-builder-2.2.24.tar.bz2 26996 RMD160 b5cdfe057ccb0496ed4c1470570575086c2d58fd SHA1 1b68631826c8499be03b0e3ad1062ccc2c4d9d0f SHA256 8b995b5dbe5a1d9e98178f68720e7a30dfb02829ddf2f63b131786d962bf1c12
|
||||
EBUILD calculate-builder-2.2.24-r1.ebuild 710 RMD160 45008dff24e10002966838c4d48f10ea4d159565 SHA1 598e97ad47e60393795bb27039deae44e0c2b85f SHA256 05569d35ff6efbed09eb8a93ddd2ef774506823fb99806f8efd4a4e23de1057e
|
||||
EBUILD calculate-builder-2.2.24-r2.ebuild 714 RMD160 ab7ba19ba5cb38d2d4fa0bcf45b00a360539cbce SHA1 058b1007d0c28a1f276e1c91e9e536e16b1691e6 SHA256 3f3041eb22eb4637b4b5d1faa275215580219b8a369fcfa2c036d71d7a4a0e30
|
||||
EBUILD calculate-builder-2.2.24-r3.ebuild 766 RMD160 d7f12a1adbce5d176e17b5db07221c80f818b389 SHA1 e993fcc667fbb0028c5ff80c770cc6546ba1790c SHA256 f35f4f8aff03b9d93a89f394a867c4f8970c95fe1b7faf4cea28b0fa8c31f5d4
|
||||
EBUILD calculate-builder-2.2.24-r4.ebuild 802 RMD160 29cb4abf312190806c36dd6ed8aeb6cab9d939c0 SHA1 84f26f980d4d4a7eb1e5249be43b2dfa650269a8 SHA256 c7097cff6366d2e4df5f108436c8692f3343c3aaf30eb04509e66cf3563dea10
|
||||
EBUILD calculate-builder-2.2.24.ebuild 588 RMD160 4ab4eb3ba650bf43594b70b68d9e3c9844d14bcf SHA1 f754e4af234393852b58ffbbbc8aff3d18408007 SHA256 1f138c0c6dca0195f43c4aca60a87632980ee9c2f7dcc3c8658d487c97b45ec4
|
||||
EBUILD calculate-builder-2.2.9999.ebuild 557 RMD160 d6e0da8ee7ba77531266337a099a0e0e067d40ae SHA1 c92269a96eea95799d1cbd1860d0ee5b2a452e28 SHA256 6a99eb07e7beb65b1a14d4479e0ecab3da3b608733bb1c09ea739a71ed3eb869
|
||||
MISC ChangeLog 17975 RMD160 1f8c3ac58c3ba32965f7dbd59ad4a084b78b61fa SHA1 48d24f3f1a35f1bab1fdadacb40ea45a0e85ed54 SHA256 bced43a694d661c77dcb921be2a9b3d266c3a177206a633a57552ae40a5955fe
|
||||
MISC ChangeLog 18199 RMD160 dd4b3f51f0bbe12b0293725bf616c8111905b246 SHA1 e3d98f5cb265b77c65d9b1056dfdacd6ccfe4e5a SHA256 3fff62e3e43f38b7adcdc4fc45ed1c4620966f558916a9b44c97b3b42d1ecec8
|
||||
MISC metadata.xml 270 RMD160 b5ff308a82cd6e594c2f04731cdbe9f80a945042 SHA1 58dbf7eb15bb2e6c6c8514f483e51dfacd1c62e9 SHA256 b65e150429ecbf36cf03d094f4e3e7518f536c61289cecff6b817326703d58a0
|
||||
|
||||
@ -0,0 +1,32 @@
|
||||
# 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.24
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix run chroot command, add ability use kernel config
|
||||
# by profile suffix, fix creating iso by builder livecd
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.24-r4.patch"
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 4745b47..bece647 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -188,7 +188,11 @@ class cl_builder(color_print):
|
||||
envdict.update(os.environ)
|
||||
commandLine = ["chroot",chroot,
|
||||
"/bin/bash","-c",command]
|
||||
- chrootCommand = process(*commandLine,stderr=PIPE,
|
||||
+ if self.clVars.Get('os_builder_arch_machine') != \
|
||||
+ self.clVars.Get('os_arch_machine') and \
|
||||
+ self.clVars.Get('os_arch_machine') == 'x86_64':
|
||||
+ commandLine = ["linux32"]+commandLine
|
||||
+ chrootCommand = process(*commandLine,stderr=STDOUT,
|
||||
stdout=PIPE,envdict=envdict)
|
||||
except KeyboardInterrupt:
|
||||
chrootCommand.kill()
|
||||
@@ -275,7 +279,6 @@ class cl_builder(color_print):
|
||||
os.unlink(curProfileFile)
|
||||
os.symlink(newProfile,curProfileFile)
|
||||
|
||||
-
|
||||
def restoreProfile(self):
|
||||
"""Restore profile"""
|
||||
if not self.curProfile:
|
||||
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
|
||||
index cb6744d..939be17 100644
|
||||
--- pym/cl_fill_builder.py
|
||||
+++ pym/cl_fill_builder.py
|
||||
@@ -121,11 +121,26 @@ class fillVars(object, varsShare):
|
||||
shortVer = shortVerSearch.group()
|
||||
else:
|
||||
return ""
|
||||
+ # find best config
|
||||
+ makeProfile = '/etc/make.profile'
|
||||
+ profileSpec = ''
|
||||
+ if path.islink(makeProfile):
|
||||
+ linkTarget = os.readlink('/etc/make.profile')
|
||||
+ parentDir, profileSpecification = path.split(linkTarget)
|
||||
+ if parentDir.endswith('x86') or parentDir.endswith('amd64'):
|
||||
+ profileSpec = profileSpecification
|
||||
configName = "config-%(system)s-%(march)s-%(ver)s" % \
|
||||
{'system':self.Get('os_linux_system'),
|
||||
'march':self.Get('os_arch_machine'),
|
||||
'ver':shortVer}
|
||||
- if path.exists(path.join(kernelDirs,configName)):
|
||||
+ configNameSpec = "config-%(system)s-%(march)s-%(ver)s-%(spec)s" % \
|
||||
+ {'system':self.Get('os_linux_system'),
|
||||
+ 'march':self.Get('os_arch_machine'),
|
||||
+ 'ver':shortVer,
|
||||
+ 'spec':profileSpec}
|
||||
+ if profileSpec and path.exists(path.join(kernelDirs,configNameSpec)):
|
||||
+ return path.join(kernelDirs,configNameSpec)
|
||||
+ elif path.exists(path.join(kernelDirs,configName)):
|
||||
return path.join(kernelDirs,configName)
|
||||
return ""
|
||||
|
||||
@@ -328,7 +343,7 @@ class fillVars(object, varsShare):
|
||||
"""
|
||||
oldSquash = self.Get('cl_builder_old_squash')
|
||||
reOldSquash = Distributive.reLive.search(oldSquash)
|
||||
- if reOldSquash:
|
||||
+ if self.Get('ac_builder_squash') == 'up' and reOldSquash:
|
||||
newNum = self.getSquashNum(reOldSquash)+1
|
||||
return "livecd.squashfs.%d"%newNum
|
||||
else:
|
||||
@ -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.24-r7
|
||||
=sys-apps/calculate-templates-2.2.24-r17
|
||||
=sys-apps/calculate-lib-2.2.24-r2
|
||||
=sys-apps/calculate-i18n-2.2.24-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.24 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.24-r4 )
|
||||
cl_client? ( =sys-apps/calculate-client-2.2.24-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-2.2.24-r2 )
|
||||
cl_installgui? ( =app-misc/calculate-install-gui-2.2.24-r1 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.14-r6 )
|
||||
"
|
||||
Loading…
Reference in new issue