|
|
|
@ -185,7 +185,7 @@ class fillVars(object, varsShare):
|
|
|
|
|
def get_cl_builder_initrd_install(self):
|
|
|
|
|
kernelname = self.Get('cl_builder_kernel')
|
|
|
|
|
reShortname = re.compile(
|
|
|
|
|
r"^vmlinuz-(\d+\.)*\d-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
r"^vmlinuz-(\d+\.)*\d+-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
if res:
|
|
|
|
|
shortname = res.groups()[2]
|
|
|
|
@ -202,7 +202,7 @@ class fillVars(object, varsShare):
|
|
|
|
|
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)
|
|
|
|
|
r"^vmlinuz-((?:\d+\.)*\d+)-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
bootPath = path.join(self.Get('cl_builder_path'),'boot')
|
|
|
|
|
if res:
|
|
|
|
@ -219,7 +219,7 @@ class fillVars(object, varsShare):
|
|
|
|
|
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)
|
|
|
|
|
r"^vmlinuz-((?:\d+\.)*\d+)-(x86_64|i686)-(.*)$",re.S)
|
|
|
|
|
res = reShortname.search(kernelname)
|
|
|
|
|
bootPath = path.join(self.Get('cl_builder_path'),'boot')
|
|
|
|
|
if res:
|
|
|
|
|