Fix create kernel

master
Mike Hiretsky 12 years ago
parent edc5ac2ff5
commit ba7316919a

@ -106,19 +106,7 @@ class cl_kernel(color_print):
mrproper=False,target="all"): mrproper=False,target="all"):
"""Run kernel compilation""" """Run kernel compilation"""
clVars = self.clVars 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" themeName = "calculate"
break
else:
themeName = "tty1"
standardParams = ["--splash=%s"%themeName, "--unionfs", standardParams = ["--splash=%s"%themeName, "--unionfs",
"--all-ramdisk-modules","--disklabel", "--all-ramdisk-modules","--disklabel",
"--no-save-config", "--firmware","--udev", "--no-save-config", "--firmware","--udev",

@ -126,7 +126,8 @@ class kernel_cmd(share_cmd):
if not self.logicObj._testKernelDirectory(values.k): if not self.logicObj._testKernelDirectory(values.k):
self.optobj.error("%s:'%s'"% self.optobj.error("%s:'%s'"%
(_("wrong kernel source directory"),values.k)) (_("wrong kernel source directory"),values.k))
elif not self.logicObj._testFullKernelDirectory(values.k) \ elif not values.initrd and \
not self.logicObj._testFullKernelDirectory(values.k) \
and self.checkNotEbuildParam(values,"postinst"): and self.checkNotEbuildParam(values,"postinst"):
self.optobj.error(("%s:'%s'"% self.optobj.error(("%s:'%s'"%
(_("in directory of kernel source not " (_("in directory of kernel source not "
@ -137,7 +138,8 @@ class kernel_cmd(share_cmd):
else: else:
self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True) self.logicObj.clVars.Set('cl_kernel_src_path',values.k,True)
elif self.checkNotEbuildParam(values,"postinst"): elif self.checkNotEbuildParam(values,"postinst"):
if not self.logicObj._testFullKernelDirectory( if not values.initrd and \
not self.logicObj._testFullKernelDirectory(
self.logicObj.clVars.Get('cl_kernel_src_path')): self.logicObj.clVars.Get('cl_kernel_src_path')):
self.optobj.error((_("in default directory of kernel " self.optobj.error((_("in default directory of kernel "
"source not enough needed files")+"\n"+ "source not enough needed files")+"\n"+

Loading…
Cancel
Save