|
|
@ -68,6 +68,19 @@ class fillVars(object, varsShare):
|
|
|
|
localVer = ""
|
|
|
|
localVer = ""
|
|
|
|
return "%s%s%s"%(self.Get('cl_kernel_ver'), extraVer, localVer)
|
|
|
|
return "%s%s%s"%(self.Get('cl_kernel_ver'), extraVer, localVer)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_builder_kernel_suffix(self):
|
|
|
|
|
|
|
|
kernelname = self.Get('cl_builder_kernel')
|
|
|
|
|
|
|
|
reShortname = re.compile(
|
|
|
|
|
|
|
|
r"^vmlinuz-((?:\d+\.)*\d)-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
|
|
|
bootPath = path.join(self.Get('cl_builder_path'),'boot')
|
|
|
|
|
|
|
|
if res:
|
|
|
|
|
|
|
|
return "%s-%s-%s"%(res.groups()[0],
|
|
|
|
|
|
|
|
self.Get('os_builder_arch_machine'),
|
|
|
|
|
|
|
|
self.Get('os_builder_linux_shortname'))
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_kernel_suffix(self):
|
|
|
|
def get_cl_kernel_suffix(self):
|
|
|
|
kernelFullVer = self.Get('cl_kernel_full_ver')
|
|
|
|
kernelFullVer = self.Get('cl_kernel_full_ver')
|
|
|
|
fullVerWithoutCalculate = kernelFullVer.replace("-calculate","")
|
|
|
|
fullVerWithoutCalculate = kernelFullVer.replace("-calculate","")
|
|
|
@ -170,12 +183,56 @@ class fillVars(object, varsShare):
|
|
|
|
return ""
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_builder_initrd_install(self):
|
|
|
|
def get_cl_builder_initrd_install(self):
|
|
|
|
return self.getInitrd(self.Get('os_builder_arch_machine'),
|
|
|
|
kernelname = self.Get('cl_builder_kernel')
|
|
|
|
self.Get('os_builder_linux_shortname'),
|
|
|
|
reShortname = re.compile(
|
|
|
|
|
|
|
|
r"^vmlinuz-(\d+\.)*\d-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
|
|
|
if res:
|
|
|
|
|
|
|
|
shortname = res.groups()[2]
|
|
|
|
|
|
|
|
archmachine = res.groups()[1]
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
shortname = self.Get('os_builder_linux_shortname')
|
|
|
|
|
|
|
|
archmachine = self.Get('os_builder_arch_machine')
|
|
|
|
|
|
|
|
return self.getInitrd(archmachine,
|
|
|
|
|
|
|
|
shortname,
|
|
|
|
self.Get('cl_builder_path'),
|
|
|
|
self.Get('cl_builder_path'),
|
|
|
|
self.Get('cl_builder_kernel'),
|
|
|
|
kernelname,
|
|
|
|
suffix="install") or ""
|
|
|
|
suffix="install") or ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_builder_kernel_config(self):
|
|
|
|
|
|
|
|
kernelname = self.Get('cl_builder_kernel')
|
|
|
|
|
|
|
|
reShortname = re.compile(
|
|
|
|
|
|
|
|
r"^vmlinuz-((?:\d+\.)*\d)-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
|
|
|
bootPath = path.join(self.Get('cl_builder_path'),'boot')
|
|
|
|
|
|
|
|
if res:
|
|
|
|
|
|
|
|
kernelconfig = "config-%s-%s-%s"%(res.groups()[:3])
|
|
|
|
|
|
|
|
if path.exists(path.join(bootPath,kernelconfig)):
|
|
|
|
|
|
|
|
return kernelconfig
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
configs = filter(lambda x:x.startswith('config'),
|
|
|
|
|
|
|
|
os.listdir(bootPath))
|
|
|
|
|
|
|
|
if configs:
|
|
|
|
|
|
|
|
return configs[0]
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_builder_kernel_systemmap(self):
|
|
|
|
|
|
|
|
kernelname = self.Get('cl_builder_kernel')
|
|
|
|
|
|
|
|
reShortname = re.compile(
|
|
|
|
|
|
|
|
r"^vmlinuz-((?:\d+\.)*\d)-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
|
|
|
bootPath = path.join(self.Get('cl_builder_path'),'boot')
|
|
|
|
|
|
|
|
if res:
|
|
|
|
|
|
|
|
systemmap = "System.map-%s-%s-%s"%(res.groups()[:3])
|
|
|
|
|
|
|
|
if path.exists(path.join(bootPath,systemmap)):
|
|
|
|
|
|
|
|
return systemmap
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
systemmaps = filter(lambda x:x.startswith('System.map'),
|
|
|
|
|
|
|
|
os.listdir(bootPath))
|
|
|
|
|
|
|
|
if systemmaps:
|
|
|
|
|
|
|
|
return systemmaps[0]
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
|
|
def get_os_builder_linux_name(self):
|
|
|
|
def get_os_builder_linux_name(self):
|
|
|
|
"""Build system name"""
|
|
|
|
"""Build system name"""
|
|
|
|
linuxShortName = self.Get("os_builder_linux_shortname")
|
|
|
|
linuxShortName = self.Get("os_builder_linux_shortname")
|
|
|
|