parent
c5cea03316
commit
326246912d
@ -1,7 +1,9 @@
|
||||
AUX calculate-assemble-2.2.11-fix_listdir.patch 1117 RMD160 2be19ad672eba81510b12e890c8bb73e6d0b178e SHA1 de443b4d122e9db0884682f941ff6357e4046e26 SHA256 6b72819a5e28968a899d71c22eb31ac1f1aecc14dfc33a554726707545cebcc8
|
||||
AUX calculate-assemble-2.2.11-fix_nvidia_assembling.patch 2652 RMD160 d76c71382b024416f0ac0433144f9b5766afd20c SHA1 b3100af6f975744ec4937867e927189d71d8d473 SHA256 f7653bf48f491f80ad10d80918f9699d3b220557236c8f350683725d2bca33bb
|
||||
AUX calculate-assemble-2.2.11-uselist.patch 3967 RMD160 5e6d2c2f11f81e60d0d911a5775989aa9a7ec60e SHA1 954f0b17c2bb91d838d137c00d346095670cf122 SHA256 fdd347b3d195660702a24188f86d092b25d953cedd9ade54d024bbb5090cf4e2
|
||||
DIST calculate-assemble-2.2.11.tar.bz2 28918 RMD160 aa2b567ff1d86159ae95857f65a3d94786f78007 SHA1 7099a6e8f4c689c341d0567091c56a7037ec58bf SHA256 7047d1a4dad511bedbccf3960f1be6f1f38cdba446bd3ade148c35af0902d27c
|
||||
EBUILD calculate-assemble-2.2.11-r2.ebuild 763 RMD160 527e3f9456d3646b349255b381b47f56f291b425 SHA1 4df33f2bf2ba18ad3959d096968f90b34522268d SHA256 c799d24450d920970b51aee1fbb0bf9f9b989e3da119d4fe269d4e9c1c7d4113
|
||||
EBUILD calculate-assemble-2.2.11-r3.ebuild 851 RMD160 91ee6f9dad37fca35c2e7227ef5abba5e3c55484 SHA1 0eaf9c6b47d53bfd3fa5e3d9868de94a7a8c080a SHA256 4b9bdc56c190db29cba68e181d72671b2f2c4f45e7e23a55e65528db84b4939b
|
||||
EBUILD calculate-assemble-2.2.9999.ebuild 482 RMD160 e9830fc17fec7062761321a7c79d5c9f1a7dd147 SHA1 8b8ace9d0c6c34bd9fe12cd9e507ba7cc32ee9af SHA256 467968b55696273c3576f10f9845a100fd4aba2c90eaaefb9ae97d478e04e11a
|
||||
MISC ChangeLog 7623 RMD160 3eb90437c959aae5c00fe8ec327e343f06d1ff66 SHA1 f63d8789ca4792142b789283322bab59495562f4 SHA256 cafd651922636c8c0786be3f512c7db56b13bf68ba09c6835d2220fbd5a89d39
|
||||
MISC ChangeLog 7855 RMD160 53a92d316d9309354b2512ea1e83b6cdff31ba2f SHA1 9a866596dcefb62e672b6457818b1493a640e75b SHA256 69f1a3939dfacd1be9317ba148e9cfbbb81ee1b30f0d2c9ce00bf6cf22f29a29
|
||||
MISC metadata.xml 273 RMD160 7d99331acd3ba20fc7ae361cb845f33f73d994ee SHA1 92e19e1e4c24527654168ac0cf9fe58ba78aeb4d SHA256 4e25d45ba43b2ab7f7ae8ab4cfc05c406566cfb143a87166de77fbd8d9f8a943
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
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"
|
||||
|
||||
DEPEND="~sys-apps/calculate-builder-2.2.11
|
||||
~sys-apps/calculate-templates-2.2.11"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# fix bug in call listdir
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.11-fix_listdir.patch"
|
||||
|
||||
# fix bug nvidia assembling
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.11-fix_nvidia_assembling.patch"
|
||||
|
||||
# add creating use list
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.11-uselist.patch"
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
commit a780af1325ddaebb34c5a1fb2366a581a0fd4dc2
|
||||
Author: Mike Hiretsky <mh@calculate.ru>
|
||||
Date: Tue Mar 22 13:00:14 2011 +0300
|
||||
|
||||
Add creating use list.
|
||||
|
||||
diff --git a/i18n/cl_assemble_ru.mo b/i18n/cl_assemble_ru.mo
|
||||
index b552f67..d084398 100644
|
||||
Binary files a/i18n/cl_assemble_ru.mo and b/i18n/cl_assemble_ru.mo differ
|
||||
diff --git a/pym/cl_assemble.py b/pym/cl_assemble.py
|
||||
index 25a68fb..32c4782 100644
|
||||
--- a/pym/cl_assemble.py
|
||||
+++ b/pym/cl_assemble.py
|
||||
@@ -175,15 +175,13 @@ class cl_assemble(color_print):
|
||||
{'command':'binaryCleaning()',
|
||||
'step':'binclean',
|
||||
'message':_("Cleaning binary repository"),
|
||||
- 'hideout':True,
|
||||
- 'condition':'.'
|
||||
+ 'hideout':True
|
||||
},
|
||||
# creating mask,unmask list
|
||||
{'command':'createMaskUnmaskList()',
|
||||
'step':'maskunmask',
|
||||
- 'message':_("Creating mask/unmask list file"),
|
||||
- 'hideout':True,
|
||||
- 'condition':'.'
|
||||
+ 'message':_("Creating mask/unmask/use list file"),
|
||||
+ 'hideout':True
|
||||
},
|
||||
# update eix base
|
||||
{'command':'eix-update',
|
||||
@@ -1495,6 +1493,10 @@ class cl_assemble(color_print):
|
||||
self.clVars.Get('cl_assemble_pkgdir'))
|
||||
dbPkg = pathJoin(chrootPath, 'var/db/pkg')
|
||||
|
||||
+ if not path.exists(dbPkg):
|
||||
+ os.makedirs(dbPkg)
|
||||
+ if not path.exists(pkgDir):
|
||||
+ os.makedirs(pkgDir)
|
||||
if path.exists(dbPkg) and path.exists(pkgDir):
|
||||
# get pkg list from distro
|
||||
pkgList = \
|
||||
@@ -1576,6 +1578,41 @@ class cl_assemble(color_print):
|
||||
return False
|
||||
return True
|
||||
|
||||
+ def createUseList(self,chrootdir,filename):
|
||||
+ """Create package uselist by chrootdir"""
|
||||
+ pkgdir = path.join(chrootdir,'var/db/pkg')
|
||||
+ def calcUseFlags(pkg):
|
||||
+ iusePath = path.join(pkgdir,pkg,"IUSE")
|
||||
+ usePath = path.join(pkgdir,pkg,"USE")
|
||||
+ if path.exists(iusePath):
|
||||
+ IUSE = set(
|
||||
+ map(lambda x: x[1:] if x and x[0] in ("-","+") else x,
|
||||
+ open(iusePath,"r").read().strip().split()))
|
||||
+ else:
|
||||
+ return ""
|
||||
+ if path.exists(usePath):
|
||||
+ USE = set(open(usePath,"r").read().strip().split())
|
||||
+ else:
|
||||
+ USE = set([])
|
||||
+ plus = " ".join(sorted(IUSE & USE))
|
||||
+ minus = " ".join(sorted(map(lambda x:"-%s"%x, IUSE - USE)))
|
||||
+ if plus:
|
||||
+ plus = " %s"%plus
|
||||
+ if minus:
|
||||
+ minus = " %s"%minus
|
||||
+ return "=%s%s%s\n"%(pkg, plus, minus)
|
||||
+
|
||||
+ if not path.exists(chrootdir):
|
||||
+ return False
|
||||
+ try:
|
||||
+ packageList = sorted(reduce(lambda x,y:x+map(lambda x:path.join(y,x),
|
||||
+ os.listdir(path.join(pkgdir,y))), os.listdir(pkgdir),[]))
|
||||
+
|
||||
+ open(filename,'w').writelines(map(calcUseFlags,packageList))
|
||||
+ except (IOError,OSError),e:
|
||||
+ return False
|
||||
+ return True
|
||||
+
|
||||
def createMaskUnmaskList(self):
|
||||
"""Action create mask unmask list"""
|
||||
baseDir = self.clVars.Get('cl_assemble_pkgdir')
|
||||
@@ -1584,9 +1621,12 @@ class cl_assemble(color_print):
|
||||
os.makedirs(baseDir,mode=0755)
|
||||
maskName = pathJoin(baseDir,"%s.mask"%name)
|
||||
unmaskName = pathJoin(baseDir,"%s.unmask"%name)
|
||||
+ useName = pathJoin(baseDir,"%s.use"%name)
|
||||
if self.createMaskList(self.clVars.Get('cl_assemble_path'),
|
||||
maskName) and \
|
||||
self.createUnmaskList(self.clVars.Get('cl_assemble_path'),
|
||||
- unmaskName):
|
||||
+ unmaskName) and \
|
||||
+ self.createUseList(self.clVars.Get('cl_assemble_path'),
|
||||
+ useName):
|
||||
return True
|
||||
return False
|
||||
@ -1,2 +1,2 @@
|
||||
EBUILD calculate-utilities-2.2.11-r9.ebuild 838 RMD160 81f37969942e8562e0ab4cb3c8aaa92ec69ede94 SHA1 b4adabbe4105a9f5d5e29a163ded50bb29474090 SHA256 1bfef81f54970ca71e6248ab73290db1b8ee65f8aa29d18bfe12b7838cb354d8
|
||||
MISC ChangeLog 3214 RMD160 20f2d956979c861da6efa69dfd593be77a1a5d30 SHA1 fbfd4b5175ebc12756988924fea3bed4f9245be8 SHA256 6859152b02f65642f8916a3644bfae7dedc3a1f2cff5b0d3e0c68f288c83833d
|
||||
EBUILD calculate-utilities-2.2.11-r10.ebuild 838 RMD160 8f664117262e61bc783029321e3fadaa306a8daa SHA1 a7a14bb83f9b28dad1eeb76325b02d96953a34a0 SHA256 9039f32470284cd5b4a7f1671daaa8898a5cb495d201b55f062b0b19f3e2fc7d
|
||||
MISC ChangeLog 3428 RMD160 34620dd07ca9f9ab4c24f15fea42ba689325408a SHA1 10a707f23fbaf8e5634462efb10970329db2face SHA256 0c56d7101476b9a02a7611514f52216655dcad6d9c269d8d4230dbad42de3d8f
|
||||
|
||||
Loading…
Reference in new issue