forked from calculate/calculate-overlay
parent
70f22f7eb5
commit
62c4cdf00b
@ -0,0 +1 @@
|
||||
# Calculate append=remove
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 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=""
|
||||
|
||||
DEPEND="~sys-apps/calculate-builder-2.2.30"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# up to r2 version
|
||||
epatch "${FILESDIR}/calculate-assemble-2.2.30-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,239 @@
|
||||
diff --git pym/cl_assemble.py pym/cl_assemble.py
|
||||
index 3c5158f..4e29776 100644
|
||||
--- pym/cl_assemble.py
|
||||
+++ pym/cl_assemble.py
|
||||
@@ -100,8 +100,7 @@ class cl_assemble(color_print):
|
||||
# foraction - perform only for cl_action == value
|
||||
DEFAULT_FORACTION = ('make','syncupdate','update')
|
||||
ACTION_LIST = \
|
||||
- [
|
||||
- # emerge -e system first
|
||||
+ [# emerge -e system first
|
||||
{'command':'emerge -e system',
|
||||
'message':_("First execute '%s'")%'emerge -e system',
|
||||
'step':'firstsystem',
|
||||
@@ -164,10 +163,10 @@ class cl_assemble(color_print):
|
||||
'condition':'dev-lang/perl',
|
||||
'progname':'perl-cleaner'},
|
||||
# install meta package
|
||||
- {'command':'emerge --noreplace calculate-meta',
|
||||
- 'checkcommand':'find /var/db/pkg/app-misc -name "calculate-meta*"',
|
||||
- 'condition':'^$',
|
||||
- 'step':'meta'},
|
||||
+ #{'command':'emerge --noreplace calculate-meta',
|
||||
+ # 'checkcommand':'find /var/db/pkg/app-misc -name "calculate-meta*"',
|
||||
+ # 'condition':'^$',
|
||||
+ # 'step':'meta'},
|
||||
# update packages with fix newuse
|
||||
#{'command':'emerge -D --newuse world',
|
||||
# 'step':'newuse'},
|
||||
@@ -621,9 +620,13 @@ class cl_assemble(color_print):
|
||||
self.printMessageForTest(_("Installing %s")%'dev-vcs/git')
|
||||
self.runChroot("USE='-perl -curl -webdav' emerge -1 git")
|
||||
|
||||
- emergeSync = "emerge --sync"
|
||||
+ if not isPkgInstalled('app-portage/eix',prefix=self.assemblePath):
|
||||
+ self.printMessageForTest(_("Installing %s")%'app-portage/eix')
|
||||
+ self.runChroot("emerge -1 eix")
|
||||
+
|
||||
+ emergeSync = "eix-sync"
|
||||
self.printMessageForTest(_("Updating portages"))
|
||||
- self.runChroot(emergeSync)
|
||||
+ self.runChroot(emergeSync,showProcess=True)
|
||||
|
||||
emergeLayman = "USE='git' emerge layman"
|
||||
self.printMessageForTest(_("Installing %s")%"layman")
|
||||
@@ -704,6 +707,14 @@ class cl_assemble(color_print):
|
||||
self.clVars.Set('cl_action',self.mainAction,True)
|
||||
self.printByResult(True)
|
||||
|
||||
+ def _rebuildWorld(self):
|
||||
+ """
|
||||
+ Rebuild world
|
||||
+ """
|
||||
+ if self.clVars.Get('cl_assemble_rebuild_world') == 'on':
|
||||
+ self.printMessageForTest(_("Re-create world"))
|
||||
+ self.runChroot("cl-core --method update --rebuild-world")
|
||||
+
|
||||
def configureFunc(self,force=False,nounmount=False):
|
||||
"""Function of configure partition for assembling by make"""
|
||||
# print info
|
||||
@@ -730,25 +741,38 @@ class cl_assemble(color_print):
|
||||
if nounmount:
|
||||
self.targetDistr = None
|
||||
|
||||
- pathAppMisc = pathJoin(self.assemblePath,'/var/db/pkg/app-misc')
|
||||
- metaPackage = self.clVars.Get('cl_assemble_meta').rpartition('/')[2]
|
||||
-
|
||||
if not isinstance(self.sourceDistr,IsoDistributive) and \
|
||||
self.clVars.Get('cl_assemble_branch') == '':
|
||||
self._unpackPortage()
|
||||
|
||||
+ # rename make profile
|
||||
+ newProfile = path.join(self.assemblePath,'etc/portage/make.profile')
|
||||
+ oldProfile = path.join(self.assemblePath,'etc/make.profile')
|
||||
+ if path.islink(newProfile) and \
|
||||
+ not path.islink(oldProfile):
|
||||
+ os.rename(newProfile,oldProfile)
|
||||
+
|
||||
self._prepareMount()
|
||||
self.prepareTemplates(True,changeAction=True)
|
||||
|
||||
- if path.exists(pathAppMisc) and metaPackage and \
|
||||
- filter(lambda x:metaPackage in x, os.listdir(pathAppMisc)):
|
||||
+ if isPkgInstalled('sys-apps/calculate-update',
|
||||
+ prefix=self.assemblePath):
|
||||
+ self._rebuildWorld()
|
||||
self.setupTemplates(True,changeAction=True)
|
||||
self.writeVar('cl_assemble_make','')
|
||||
return True
|
||||
|
||||
- self._updatePackages()
|
||||
+ fullAssemble = not isPkgInstalled('sys-apps/calculate-install',
|
||||
+ prefix=self.assemblePath)
|
||||
+ if fullAssemble:
|
||||
+ self._updatePackages()
|
||||
+ else:
|
||||
+ emergeSync = "eix-sync"
|
||||
+ self.printMessageForTest(_("Updating portages"))
|
||||
+ self.runChroot(emergeSync,showProcess=True)
|
||||
self.setupTemplates(True,changeAction=True)
|
||||
|
||||
+
|
||||
self.printMessageForTest(
|
||||
_("Enabling calculate-install to configure packages"))
|
||||
if "calculate" in self.clVars.Get('os_assemble_system_profile'):
|
||||
@@ -756,15 +780,16 @@ class cl_assemble(color_print):
|
||||
# need emerge with USE="minimal", but emerging
|
||||
# will install iproute2 with USE="minimal" also
|
||||
self.runChroot("emerge -1 sys-apps/iproute2")
|
||||
- self.runChroot("USE='minimal -pxe' emerge "
|
||||
- 'sys-apps/calculate-install '
|
||||
- 'sys-apps/calculate-core')
|
||||
- if path.exists(path.join(self.clVars.Get('cl_assemble_path'),
|
||||
- "usr/sbin/cl-core")):
|
||||
- self.runChroot("/usr/sbin/cl-core --append-variable "
|
||||
- "cl_merges=calculate-install")
|
||||
+ if isPkgInstalled('sys-apps/calculate-utilities',
|
||||
+ prefix=self.assemblePath):
|
||||
+ self.runChroot("emerge -u sys-apps/calculate-update "
|
||||
+ "sys-apps/calculate-utilities")
|
||||
else:
|
||||
- self.runChroot("cl-install --install")
|
||||
+ self.runChroot("USE='minimal -pxe' emerge "
|
||||
+ 'sys-apps/calculate-update '
|
||||
+ 'dev-python/pyopenssl '
|
||||
+ 'sys-apps/calculate-install '
|
||||
+ 'sys-apps/calculate-core')
|
||||
else:
|
||||
self.printByResult(skip=True)
|
||||
|
||||
@@ -772,9 +797,16 @@ class cl_assemble(color_print):
|
||||
self.printMessageForTest(_("Installing %s")%"portage")
|
||||
self.runChroot(emergePortage)
|
||||
|
||||
+ self._rebuildWorld()
|
||||
+
|
||||
+ if not fullAssemble:
|
||||
+ self.setupTemplates(True,changeAction=True)
|
||||
+ self.writeVar('cl_assemble_make','')
|
||||
+ return True
|
||||
+
|
||||
if not isinstance(self.sourceDistr,IsoDistributive):
|
||||
self.printMessageForTest(_("Receiving kernel sources"))
|
||||
- self.runChroot('USE="-vmlinuz" emerge '
|
||||
+ self.runChroot('USE="-minimal -vmlinuz" emerge '
|
||||
"sys-kernel/calculate-sources")
|
||||
|
||||
if not isinstance(self.sourceDistr,IsoDistributive):
|
||||
@@ -917,7 +949,7 @@ class cl_assemble(color_print):
|
||||
chrootCommand = process(*commandLine,stderr=ERRval,
|
||||
stdout=IOval,envdict=envdict)
|
||||
DEBUG(self._getCommand(chrootCommand.command))
|
||||
- if raiseError and chrootCommand.failed():
|
||||
+ if chrootCommand.failed() and raiseError:
|
||||
raise AssembleError(
|
||||
_("An error occurred when executing the command")+
|
||||
":\n %s"%self._getCommand(chrootCommand.command))
|
||||
@@ -1450,7 +1482,7 @@ class cl_assemble(color_print):
|
||||
|
||||
def checkDowngrades(self):
|
||||
"""Run check downgrades"""
|
||||
- cmd = self.runChroot("FORMAT='{downgrade}%{FORMAT_ALL}{}' eix -I",
|
||||
+ cmd = self.runChroot("/usr/bin/eix -T",
|
||||
raiseError=False,
|
||||
showProcess=True)
|
||||
return True
|
||||
@@ -1662,7 +1694,7 @@ class cl_assemble(color_print):
|
||||
while drivers:
|
||||
repeatDrivers = []
|
||||
for verName,maskName,drvVer in drivers:
|
||||
- rePackage = re.compile("^\[ebuild[^\]]+]\s+(\S+)")
|
||||
+ rePackage = re.compile("^\[ebuild[^\]]+]\s+([^\s:]+)")
|
||||
checkprocess = self.runChroot(
|
||||
"emerge -pv %s"%
|
||||
drvVer, raiseError=False,joinErr=True)
|
||||
diff --git pym/cl_assemble_cmd.py pym/cl_assemble_cmd.py
|
||||
index 64ea758..5733c0e 100644
|
||||
--- pym/cl_assemble_cmd.py
|
||||
+++ pym/cl_assemble_cmd.py
|
||||
@@ -74,6 +74,9 @@ CMD_OPTIONS = [{'shortOption':"d",
|
||||
{'longOption':"no-buildpkg",
|
||||
'help':_("create no binary packages for all merged packages")
|
||||
},
|
||||
+ {'longOption':"skip-rebuild-world",
|
||||
+ 'help':_("do not rebuild world file")
|
||||
+ },
|
||||
{'longOption':"set"},
|
||||
{'shortOption':"f",
|
||||
'longOption':"force",
|
||||
@@ -142,8 +145,11 @@ class assemble_cmd(share_cmd):
|
||||
self.checkChoice("--source",values.source, validSources)
|
||||
if values.name:
|
||||
if not self.logicObj.setName(values.name):
|
||||
- self.error(_("option %s")%"--name"+
|
||||
+ self.optobj.error(_("option %s")%"--name"+
|
||||
": "+ _("invalid value '%s'"%values.name))
|
||||
+ if values.skip_rebuild_world:
|
||||
+ self.logicObj.clVars.Set('cl_assemble_rebuild_world',
|
||||
+ "off",True)
|
||||
return (values, args)
|
||||
|
||||
def isScratch(self):
|
||||
diff --git pym/cl_fill_assemble.py pym/cl_fill_assemble.py
|
||||
index c0a7a39..21e7832 100644
|
||||
--- pym/cl_fill_assemble.py
|
||||
+++ pym/cl_fill_assemble.py
|
||||
@@ -166,10 +166,7 @@ class fillVars(object, glob_attr):
|
||||
|
||||
def get_cl_assemble_meta(self):
|
||||
"""Meta package for world building"""
|
||||
- if "calculate" in self.Get('os_assemble_system_profile'):
|
||||
- return "app-misc/%s-meta"%\
|
||||
- self.Get('os_assemble_linux_shortname').lower()
|
||||
- return "system"
|
||||
+ return "world"
|
||||
|
||||
def get_cl_assemble_snapshot_portage(self):
|
||||
"""Find latest snapshot"""
|
||||
@@ -490,7 +487,7 @@ class fillVars(object, glob_attr):
|
||||
|
||||
def get_cl_assemble_drivers_info(self):
|
||||
"""matrix for prepare driver script"""
|
||||
- return [[]]
|
||||
+ return []
|
||||
|
||||
def prepareScript(self,info):
|
||||
"""
|
||||
diff --git pym/cl_vars_assemble.py pym/cl_vars_assemble.py
|
||||
index 9858c04..3664c16 100644
|
||||
--- pym/cl_vars_assemble.py
|
||||
+++ pym/cl_vars_assemble.py
|
||||
@@ -164,3 +164,7 @@ class Data:
|
||||
|
||||
# part of script for driver installing
|
||||
cl_assemble_drivers_script = {'mode':'r'}
|
||||
+
|
||||
+ # execute cl-core --method update --rebuild-world on assemble
|
||||
+ cl_assemble_rebuild_world = {'mode':'w',
|
||||
+ 'value':'on'}
|
||||
@ -0,0 +1,34 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 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=""
|
||||
|
||||
DEPEND=">=sys-kernel/calckernel-3.4.18
|
||||
~sys-apps/calculate-lib-2.2.30
|
||||
!<sys-apps/calculate-1.4.0_p20100921
|
||||
app-cdr/cdrkit
|
||||
sys-fs/squashfs-tools"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# add check on fully kernel sources, fix initrd run, fix using new themes
|
||||
epatch "${FILESDIR}/calculate-builder-2.2.30-r6.patch"
|
||||
}
|
||||
@ -0,0 +1,206 @@
|
||||
diff --git pym/cl_builder.py pym/cl_builder.py
|
||||
index 2cc5334..180a0b3 100644
|
||||
--- pym/cl_builder.py
|
||||
+++ pym/cl_builder.py
|
||||
@@ -328,7 +328,7 @@ class cl_builder(color_print):
|
||||
createdDev = self.createUrandom(mp)
|
||||
self.dispatchConf(mp)
|
||||
self.updatePortage(mp)
|
||||
- self.clearPortage(mp)
|
||||
+ #self.clearPortage(mp)
|
||||
self.updateMan(mp)
|
||||
self.removeUrandom(mp,createdDev)
|
||||
|
||||
@@ -578,8 +578,12 @@ class cl_builder(color_print):
|
||||
"""Get list for portage exclude by 'cl_builder_tree'"""
|
||||
if self.clVars.Get('cl_builder_tree') == 'off':
|
||||
portagePath = pathJoin(sourceDirectory,"usr/portage")
|
||||
- return map(lambda x: path.join("usr/portage",x),
|
||||
- filter(lambda x: not x in ( "eclass", "licenses", "profiles"),
|
||||
+ overlayPath = pathJoin(sourceDirectory,"var/lib/layman/calculate")
|
||||
+ return map(lambda x: path.join("var/lib/layman/calculate",x),
|
||||
+ filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
|
||||
+ listDirectory(overlayPath))) + \
|
||||
+ map(lambda x: path.join("usr/portage",x),
|
||||
+ filter(lambda x: not x in ("distfiles", "eclass", ".git","profiles"),
|
||||
listDirectory(portagePath)))
|
||||
else:
|
||||
return []
|
||||
diff --git pym/cl_fill_builder.py pym/cl_fill_builder.py
|
||||
index fbaf6df..77727f1 100644
|
||||
--- pym/cl_fill_builder.py
|
||||
+++ pym/cl_fill_builder.py
|
||||
@@ -281,11 +281,31 @@ class fillVars(object, varsShare):
|
||||
systemRoot = self.Get('cl_builder_path')
|
||||
return str(countFiles(systemRoot))
|
||||
|
||||
+ def getVersionFromCalculateEnv(self,systemroot):
|
||||
+ """Get version from calculate ini"""
|
||||
+ pathname = path.join(systemroot,
|
||||
+ 'var/lib/layman/calculate/profiles/calculate.env')
|
||||
+ if path.exists(pathname):
|
||||
+ FD = open(pathname)
|
||||
+ data = FD.readlines()
|
||||
+ FD.close()
|
||||
+ verList = filter(lambda y:y,
|
||||
+ map(lambda x:\
|
||||
+ len(x.split("="))==2 and\
|
||||
+ x.split("=")[0].strip() == "os_linux_ver" and\
|
||||
+ x.split("=")[1].strip(), data))
|
||||
+ if verList:
|
||||
+ reVer=re.compile("^((\d+\.)*\d|\d+)$",re.S)
|
||||
+ reRes = filter(reVer.search,verList)
|
||||
+ if reRes:
|
||||
+ return reRes[0]
|
||||
+
|
||||
def get_os_builder_linux_ver(self):
|
||||
"""Build system ver"""
|
||||
linuxShortName = self.Get("os_builder_linux_shortname")
|
||||
rootSystem = self.Get('cl_builder_path')
|
||||
return self.getVersionFromMetapackage(rootSystem,linuxShortName) or \
|
||||
+ self.getVersionFromCalculateEnv(rootSystem) or \
|
||||
self.getVersionFromCalculateIni(rootSystem) or \
|
||||
self.getVersionFromGentooFiles(rootSystem) or "0"
|
||||
|
||||
diff --git pym/cl_image_cmd.py pym/cl_image_cmd.py
|
||||
index f05ac27..9564bec 100644
|
||||
--- pym/cl_image_cmd.py
|
||||
+++ pym/cl_image_cmd.py
|
||||
@@ -70,6 +70,9 @@ CMD_OPTIONS = [{'shortOption':"p",
|
||||
'optVal':"TIMEZONE",
|
||||
'help':_("timezone by default")
|
||||
},
|
||||
+ {'longOption':'keep-tree',
|
||||
+ 'help':_("keep portage tree in image")
|
||||
+ },
|
||||
{'longOption':"set"},
|
||||
{'shortOption':"f",
|
||||
'longOption':"force",
|
||||
@@ -170,6 +173,9 @@ class image_cmd(share_cmd):
|
||||
if values.noisohybrid:
|
||||
self.logicObj.clVars.Set('cl_builder_isohybrid_set','off',True)
|
||||
|
||||
+ if values.keep_tree:
|
||||
+ self.logicObj.clVars.Set('cl_builder_tree','on',True)
|
||||
+
|
||||
if args and args[0] == "squash":
|
||||
self.logicObj.clVars.Set('cl_builder_iso_path','/mnt/flash',True)
|
||||
if values.timezone and not self.logicObj.setTimezone(values.timezone):
|
||||
diff --git pym/cl_kernel.py pym/cl_kernel.py
|
||||
index b6e3c35..456efad 100644
|
||||
--- pym/cl_kernel.py
|
||||
+++ pym/cl_kernel.py
|
||||
@@ -74,12 +74,23 @@ class cl_kernel(color_print):
|
||||
"""Test directory for kernel sources"""
|
||||
makefilepath = path.join(dirpath,'Makefile')
|
||||
kbuildpath = path.join(dirpath,'Kbuild')
|
||||
- if not path.exists(makefilepath) \
|
||||
- or not path.exists(kbuildpath) \
|
||||
- or not "Kbuild for top-level directory of the kernel" in \
|
||||
+ if path.exists(makefilepath) \
|
||||
+ and path.exists(kbuildpath) \
|
||||
+ and "Kbuild for top-level directory of the kernel" in \
|
||||
open(kbuildpath,'r').read():
|
||||
- return False
|
||||
- return True
|
||||
+ return True
|
||||
+ return False
|
||||
+
|
||||
+ def _testFullKernelDirectory(self,dirpath):
|
||||
+ """To check the directory for full kernel sources
|
||||
+
|
||||
+ Kernel may be installed with minimal (later vmlinuz) flag"""
|
||||
+ documentationPath = path.join(dirpath,'Documentation')
|
||||
+ driversPath = path.join(dirpath,'drivers')
|
||||
+ if path.exists(documentationPath) \
|
||||
+ and path.exists(driversPath):
|
||||
+ return True
|
||||
+ return False
|
||||
|
||||
def setNoColor(self):
|
||||
self.color = False
|
||||
@@ -95,19 +106,7 @@ class cl_kernel(color_print):
|
||||
mrproper=False,target="all"):
|
||||
"""Run kernel compilation"""
|
||||
clVars = self.clVars
|
||||
- for themePkg in ['media-gfx/cldx-themes',
|
||||
- 'media-gfx/cld-themes',
|
||||
- 'media-gfx/cldg-themes',
|
||||
- 'media-gfx/cls-themes',
|
||||
- 'media-gfx/cds-themes',
|
||||
- 'media-gfx/cmc-themes']:
|
||||
- installed = getPkgInstalled(themePkg,
|
||||
- prefix=self.clVars.Get('cl_chroot_path'))
|
||||
- if installed and installed[0]['PV'].startswith('12'):
|
||||
- themeName = "calculate"
|
||||
- break
|
||||
- else:
|
||||
- themeName = "tty1"
|
||||
+ themeName = "calculate"
|
||||
standardParams = ["--splash=%s"%themeName, "--unionfs",
|
||||
"--all-ramdisk-modules","--disklabel",
|
||||
"--no-save-config", "--firmware","--udev",
|
||||
diff --git pym/cl_kernel_cmd.py pym/cl_kernel_cmd.py
|
||||
index 3a85ada..54edbc0 100644
|
||||
--- pym/cl_kernel_cmd.py
|
||||
+++ pym/cl_kernel_cmd.py
|
||||
@@ -121,12 +121,30 @@ class kernel_cmd(share_cmd):
|
||||
self.checkIncompatibleParam("initrd")
|
||||
if values.symlink:
|
||||
self.checkIncompatibleParam("symlink")
|
||||
- if values.k:
|
||||
- if not self.logicObj._testKernelDirectory(values.k):
|
||||
- self.optobj.error("%s:'%s'"%
|
||||
- (_("wrong kernel source directory"),values.k))
|
||||
- else:
|
||||
- self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
|
||||
+ if not values.v:
|
||||
+ if values.k:
|
||||
+ if not self.logicObj._testKernelDirectory(values.k):
|
||||
+ self.optobj.error("%s:'%s'"%
|
||||
+ (_("wrong kernel source directory"),values.k))
|
||||
+ elif not values.initrd and \
|
||||
+ not self.logicObj._testFullKernelDirectory(values.k) \
|
||||
+ and self.checkNotEbuildParam(values,"postinst"):
|
||||
+ self.optobj.error(("%s:'%s'"%
|
||||
+ (_("in directory of kernel source not "
|
||||
+ "enough needed files"),
|
||||
+ values.k))+"\n"+
|
||||
+ _("Probably calculate-sources was "
|
||||
+ "compiled with USE 'minimal'"))
|
||||
+ else:
|
||||
+ self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
|
||||
+ elif self.checkNotEbuildParam(values,"postinst"):
|
||||
+ if not values.initrd and \
|
||||
+ not self.logicObj._testFullKernelDirectory(
|
||||
+ self.logicObj.clVars.Get('cl_kernel_src_path')):
|
||||
+ self.optobj.error((_("in default directory of kernel "
|
||||
+ "source not enough needed files")+"\n"+
|
||||
+ _("Probably calculate-sources was "
|
||||
+ "compiled with USE 'minimal'")))
|
||||
if values.c and values.o:
|
||||
self.optobj.error("%s: %s"%(_("incompatible options"),
|
||||
self.getStringIncompatibleOptions(["c","o"])))
|
||||
@@ -161,6 +179,9 @@ class kernel_cmd(share_cmd):
|
||||
def checkEbuildParam(self,options,phase):
|
||||
return not options.ebuild or os.environ["EBUILD_PHASE"] == phase
|
||||
|
||||
+ def checkNotEbuildParam(self,options,phase):
|
||||
+ return not options.ebuild or os.environ["EBUILD_PHASE"] != phase
|
||||
+
|
||||
def makeKernel(self,options):
|
||||
"""Run kernel compilation, installation, optimization"""
|
||||
# if set ebuild param check cur EBUILD_PHASE, run kernel compilation
|
||||
diff --git pym/cl_vars_builder.py pym/cl_vars_builder.py
|
||||
index 44e4965..c1fd439 100644
|
||||
--- pym/cl_vars_builder.py
|
||||
+++ pym/cl_vars_builder.py
|
||||
@@ -98,7 +98,7 @@ class Data:
|
||||
cl_builder_kernel_suffix = {}
|
||||
|
||||
# include portage directory from image
|
||||
- cl_builder_tree = {'value':'on'}
|
||||
+ cl_builder_tree = {'value':'off'}
|
||||
|
||||
cl_builder_isohybrid_set = {'value':'on'}
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# 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=""
|
||||
IUSE="
|
||||
cl_assemble
|
||||
cl_builder
|
||||
cl_server
|
||||
"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!sys-apps/calculate-templates
|
||||
!<sys-apps/calculate-install-3.0.0_alpha1
|
||||
=sys-apps/calculate-lib-2.2.30
|
||||
=sys-apps/calculate-i18n-2.2.30-r1
|
||||
|
||||
cl_assemble? ( =sys-apps/calculate-assemble-2.2.30-r2 )
|
||||
cl_builder? ( =sys-apps/calculate-builder-2.2.30-r6 )
|
||||
|
||||
cl_server? ( =sys-apps/calculate-server-2.1.16-r5 )
|
||||
"
|
||||
Loading…
Reference in new issue