From bdc6331e2728613e08e9789ea41ea879dd7ddf36 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Tue, 2 Nov 2010 11:47:53 +0300 Subject: [PATCH] Add kernel renaming. --- i18n/cl_builder_ru.mo | Bin 12031 -> 12134 bytes pym/cl_builder.py | 5 +++- pym/cl_fill_builder.py | 63 +++++++++++++++++++++++++++++++++++++++-- pym/cl_vars_builder.py | 9 ++++++ 4 files changed, 73 insertions(+), 4 deletions(-) diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo index c58ed19f55f1b0e1e90f6137e4c1b50284639169..87944a94cd6ee2f0a9cf5406ed5d3dc8b5d60403 100644 GIT binary patch delta 2335 zcmZA2drXye9LMo5aaG|E2UI+oJYX6TM?%EBM0mU*AeMOH6oL|+I7U*^>Eh-*xw&L> zEH87;)t1f;*(6t>f9T5kFRIl}JG8Z|Hn(!M)taeu{n6$9dCtSu`i<{-{hr@>&hPU5 z{ho(^I&O5vfAD9VFiMn|Lu^ksJB)8<@j)5SF$>_QScX61eV9GPY!S}Kd<^3%jAA98 z$71{jr{hg@Fnemsa-44#w?-@^QWa;hU&N*b^l(}?+>FN z&wJlr#cHl6a2{smroOMh0OMO76|E?Yv+xyE$49UfhrI8{Q5m{{nn-${+5H$q-Pelx zKIVDU^8z}we~y~qub#O+CcyYsNks!T;9TrLCTsgpKN!HJIE)(LI%=YS<7_M@|H|NE zR6i|Ph~22)zlxgZNt}Tnpcb6OxKeeK3Vm6|y{VNHqV~ELHECp-YO*jN=<-XbYnd_*oiYSj_UX%DwSU# zzqQ}c!8G#CpOx{!8f+;lwM|}o6kkg-+mCvR?lSv&^warrY>iXdOl1&tI+oyT<2Q#9!YijSgh)&O<5343rkUdCm38#UpDq*d)ZaT~tnUH^e=_526P>lVIv z37c^ob;ydG)BqvRUerWR;6l8Djra>{0X584ziY!4co0d7eTH!QQNwlq~{`Pq7Blr~86G+!q z#pq9BE4DMfjZk6REr-!HQwQ}pHK8)njvMeC?#0`<7W){r1~1||{2A9^6-S&0!eYp+ zb_k<*0k`8!2GQdg!?E2 z66U@EC)--7Xsf0X4TQE;hg#dL67S$+2eFb+*+A&k8P)}*hsYotLZ@2?O@~NDd%uO) zqzg(X!O?Ngg5Cj{go<7~D$T?rL=K^M0Z-31Yp24?&HYEi{~`DN4DMU&aSRZgANL=} zR4gUBi4dXFtuj4@J&QVEo5$YGDbJkS7mM`wzx-lsS6`14i$4Cxu&L;W}0hO3Z@8Js04!%K~N%z5?B{? z5lRG#M3_c}Ce_$TG+(Z7cd%%i z#6YpEZ7HwvwGMu?W1ULr&*Qw47dVJFIF5ClOX*n;GW~Hu4lxnV)*Ae{SsPZ51~1R?cN!ypAd5L3*Zq$O^w;O8zV5UOh-@>z&N` zF@AQnDP<0`)}P9LI=|%<_BY65T;8mcU3rvyd68SVSlZ)wieq`5O{~}eQ@Me2_%`#| zU8x-pHCjr$jq~^>m+(i<;5h3yfjgOTn~&-w^NXCzYi!_n^-PJDa}oD&8qYHWwD-_b zj^-5ZzvJw-aej-n3?V6ES{$ipw!voZY>pV=3K7kG3K+ZQx> zSNRGX-2DKLa7NDaArA9VXTaw;lgF9L++_AhqxHCtJGr0l)1=EZqmAMQzR3ObNU0m8 z{+ZEaSC?}uvzBMrh7XHJMC;bw!F-WT+zTGsU$k@BbIpH5mfOx8B7sruXUxn^Vi-`eYBeY=XbBAalTXx*M|b+AUi zIU8?a?c_#|5m}P7EXllTuVo{p+pc!pnc3a`!Bs!U0nAskKxD7@yj%V=(zYs3hz5~1 zSY#h9$qKC1$?je+()x*8s=b!~-TCCw`imJN8})wCLv%WEw$rfoC+fN%t3UBuWl#72 E0PFt8s{jB1 diff --git a/pym/cl_builder.py b/pym/cl_builder.py index 7e3cec2..75bd391 100644 --- a/pym/cl_builder.py +++ b/pym/cl_builder.py @@ -319,7 +319,9 @@ class cl_builder(color_print): + " (yes/no)" dialogRes = dialogYesNo(dialogMessage) if dialogRes in (None,False): - return True + self.assembleIso = False + self.printERROR(_("Interrupting the image creating")) + return False self.printMessageForTest(_("Prepare data for live image")) self.prepareSourceDistributive(self.sourceDistr) self.printByResult(True) @@ -488,6 +490,7 @@ class cl_builder(color_print): var = 'os_assemble_arch_machine' march = \ _toUNICODE(envData.getVar(section,var)).encode('utf-8') + shortname = shortname.upper() if shortname: self.clVars.Set('os_builder_linux_shortname',shortname,True) if march: diff --git a/pym/cl_fill_builder.py b/pym/cl_fill_builder.py index da18a7e..320cd96 100644 --- a/pym/cl_fill_builder.py +++ b/pym/cl_fill_builder.py @@ -68,6 +68,19 @@ class fillVars(object, varsShare): 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): kernelFullVer = self.Get('cl_kernel_full_ver') fullVerWithoutCalculate = kernelFullVer.replace("-calculate","") @@ -170,12 +183,56 @@ class fillVars(object, varsShare): return "" def get_cl_builder_initrd_install(self): - return self.getInitrd(self.Get('os_builder_arch_machine'), - self.Get('os_builder_linux_shortname'), + kernelname = self.Get('cl_builder_kernel') + 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_kernel'), + kernelname, 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): """Build system name""" linuxShortName = self.Get("os_builder_linux_shortname") diff --git a/pym/cl_vars_builder.py b/pym/cl_vars_builder.py index 4556945..eff1db4 100644 --- a/pym/cl_vars_builder.py +++ b/pym/cl_vars_builder.py @@ -88,6 +88,15 @@ class Data: # initramfs image cl_builder_initrd_install = {} + # kernel config name + cl_builder_kernel_config = {} + + # kernel system.map + cl_builder_kernel_systemmap = {} + + # kernel suffix for builder + cl_builder_kernel_suffix = {} + # build system name os_builder_linux_name = {}