From f6a6c93cee7baea75abc7bcb8c30d35063995b60 Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Sat, 13 Nov 2010 17:27:22 +0300
Subject: [PATCH] Add kernel cleaning.

---
 i18n/cl_builder_ru.mo | Bin 12637 -> 12854 bytes
 pym/cl_builder.py     |  60 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/i18n/cl_builder_ru.mo b/i18n/cl_builder_ru.mo
index 99256d9e23ddb2c0a3ae5b8877790463a9513b27..d95ab0e9ec7e0364504eee79ec2230310f14a79c 100644
GIT binary patch
delta 2624
zcmX}te@vBC9LMp4poD+|0pXA2@dw%u5D<_cEg%sPF-)`+BJpyA8+xz1TntLP!kBJ3
z(@9R}D*MMjT5cgX5DIN>G-uOwuk}xDR;%XLvL8%Zv$^d3dG5_KzV~&W^PGFmdA{d7
zmm51qTK(Up#2hyi4>6y3JK7jEB*gMT*&b)iTx`KbxEGh;X?z$ba0UK|>X$Y%e4U50
zxprU$c49V;U<Uq#X~y`?T`Cq0De++oFpKL3RL9pa69+IE18Cvr$N=Uh7T{fc6!Q|o
zZbRMgM}6-UYMir}f>-VPeq+9;l25~5xEPluhC9@vo~Rl1q&+wXPoM@qhYRs?<o++H
z493n1FJK8OQyWnII#KtJM;wyOZ@#2r;Vsk(6Um#*K`o#THDNn0z&DVGHSePOeSlBk
z71RXNlEMqk#Ccqopfb4`HI5q}#D4T^fRj|T(osyu8>lCqLZvE&{INEZg?f@g)LGbq
znz#p3aR{^VGHT)}Bq=6|K^V#`Kpm@Gd<=_I*#F0=?4Y3t-@;s+Kut7-+S7EF`v{hy
z7UDup*o_5v7<2Fv>H+>h{>%(Isoz{aG=45BLr%=YzEpoWr2!h0qU#ZVMNJq(zLsJR
zDnkvZE$BfDPvS#3hD8`cWi*ymXraqc3t5R4u0y(*4kS6I*H1;M9zdn+T%^M_?2h6!
zL7jmnR`)c%isg77OYsg?V<9I~8Q6!L@I%yLzK6ZIm_a)546eXrCd)_v8Y*Q}_TZCv
z9@pY+)O%Y>zI440wG|Vn34cdrrkK^&V>4=DA7LR*q86}}bWt_yunOC8Ar2xL^_%Nd
z>S*{IS79aj(?or^5znHY^j|E&5-Ys&PE`9D+=4$uu8SGHl4~zE;3(E&A}3adb1Q26
z1GauvLPdM~EiT7<ScA)1zMi0)4}I|+REDk~SvAx7k_O5|WvB-A!*vvOh(}Nhyot)x
zLT)Pc)u;@;j;om83`QD$L+!~TdMjlOxD36>ZkSW30Y@V3lemrRIdo#p#)n(+1UBL%
z>TuR^lC@AL>NPxq%E<fZUr*&0l^!giS0x6p0Po;h%;9BSgFfVqG-Jrz<|?-1ZEV6O
z-esz044K>fj5?GFr0;nwMLobVJb>4-+5gp48t7H78>rNMjn7~V`=N=eu>udHG8Du*
zoJQxBSdT~XAd+p9!ON`-u130=M%;^UB5N|S459}t$S41sskG6c!*>C-$Nyjyb`VP4
zE5t^EMA>C7pYtPiO`xKIHHIEYC5~V|lb{RA3&c#~0bNjb5u3FCI=vizJJm1aQ$#DF
zlv#v|7NyiaN9YGc`>mp<RMEDnD7`AP31v>_!%1+ojDv_K^n;|5OlW@lfB$w&B6MI>
zHW0;jE&Rh1soqEXuh;SaGAmMH2ksZ0a+Oq~iO`wQcB$~YrT-oF{PydmMx9!fXNh@s
zjUNsyBBl||gqz4D*de>b^QrgzCE`UQmZ&ClQ0oa^fBSWH;dDYJk<hEyuK8=Iv=C*)
z4q_+KMySLPyzcfXE>{CZ2S+8HSWnavI;<)>lqxd_y^1=FRYV1$b7q&U-Cj?d)#%yn
zb9n~p;`ZdbEtlKp^m@B?`z(*c(dG3zTdmeEugl$L`P!Y9!?SBwi@Viwb~_ziK3W5p
z;=YPX-RW#`t4mg=)#~y(9X^k@CvYsjG_mS*Xn$}xv_EtxI20TVUI>l`hb^iX`Oux<
zc<6|#hk~C4F9tuQ!>~H3@e>-x?eBaXIu!UKV>~+Pz0g7K^@jSmIml!Kf99qI`saU>
F`X7vOJdFSV

delta 2408
zcmZA1d#u-E90%~{=%$XNBS%j6)77nuE{LLYiaG}gxmN1XkthpmZkdz9Oh#k=NR!QM
z)*o!`khv^F%O7FP=4`e@EPu(yV%9KT@89{&%(LI;`+C0D=XpNQ^ZfR9^xV?<&5*v&
z7v)YdQaswHlw3H{-$7{}Sjup=a2!`~0y{a1uT<}U$QjOiIGFW=N}10lPUdPhayw7q
zZZ`Q$dB3+(4soIzHMPADp2jiGn|Tu3>4kC+XYx6o!H=u{!hCqd3BAuxXWn1HAzaPe
zzn9bb6vu17?5jTTJu}kZn32`jl`@P|nHO6*mMfY2o0*L5Vmk6JlbIiw=LVhFdw+7(
zwyJB`<o;HU(SCU)74By`aF}WEZ;s|E@@a5o7V}&)XS1E@zz(LPdpUxiGpRnpe5YT1
zDJOFT^ZqoZqf6L1RAr+|MzoDd)oyCLyvK~>AT#$rF%8$7j|R4JGFLJUZ==DNSLxC6
zCI|2U&*W!3i^q5lCk~PSX)4RLnufM9seFy6vzzHix}OFIGjl(IQ+NY2fXC@qUUbNF
zdzc0eFd6!jXLFdF$>^m_hHh_=|5UcPkOp^h68AGH`jL5|ULKn`ji>TTrh&CgN_R0G
z-A8SePuaxp=vR)@OM@<rOs3CdGS-^>=YbC1UsKA1%o;eVm3cf-?^<{TFW`1&<OjKw
z$2gvgEr3UOH`nnfXK<B|P3N<0=6=p$KdmohXNyYq=@Zop2bn1tB5$pn%PaX9(~++@
zi;ad+X_y(&-42WR49BvY$>1?A=4ff0%k|9nck`<3|1VWCvWfC|KHHfdzrbAogx7IE
zQ}6joUgCTQui>}6jI*?w#kiT3HB_~m=}3(gJe8B!#%o#G|1YWJ#g90LKU4O~WW&pc
z7BZ>2i}{0ki&?ZiOb6?HJ!__wN%;mQLoYKU?yjCUcsT=WqokBgJgrk@hl;G1510@3
z<OUmkbs3wfPh}@><UTIXeGg?ZZe%+86tnI2G8y@pm-A#R`vJD|5`N8@Z1Pg)LX~S&
zF6K_!ape%TQI2vghugd>xRu$*ha7yn)Y{Bhj5B#XZ)OJYHXrA&ypWruw<Xt^%>BUy
zJZp;iPs1C0Wj^0vQuI3)^9&PqF7M-ZzE0UJ^L!;K>|o|}3m@VhYO_qW*)zgryp~Th
zQ*oG?;;|a3;qCeV&qy-LB_g9vv8yWEFm;`+6v?QJE+0raUSz&&bE0IC4ip1&qO22F
zi7e8QA_MIZ>Buc29UGnbPsz$REtRd7kvEBytc#SSD`j>sl|P$1)o&21g|%327JWpf
zFr~hie~*LJ@?Vp3xj08u+Rq&Qza-7){pVs`wLaxP*D_@(`NzvbwQegbAC<r5OkGOW
zOiC7S%1SY;Qqz8`O6KY~u|ljDnOjp?DT5rZ7B`8k`u<{}I7wU~#)#~K+eAN+a)L0`
zWsO)QR*8#5ySPK#DpLAppNv(>qM4T~N)}*BgSb?*i58LK@k+^}%ZeW-vZb2E(&ug*
c_+;16L0{B#{Z%`=uIu4p@AT<fHLAPeABGRtUjP6A

diff --git a/pym/cl_builder.py b/pym/cl_builder.py
index 3c5cbfc..c3fccd7 100644
--- a/pym/cl_builder.py
+++ b/pym/cl_builder.py
@@ -23,7 +23,8 @@ import sys
 import traceback
 from os import path
 from cl_utils import process,pathJoin,getRunCommands,getTupleVersion,\
-                        childMounts,_toUNICODE,isMount
+                        childMounts,_toUNICODE,isMount,typeFile, \
+                        removeDir
 from subprocess import STDOUT,PIPE
 from cl_print import color_print
 from cl_datavars import DataVars
@@ -158,6 +159,59 @@ class cl_builder(color_print):
                     self.printERROR(failMessage)
             self.startMessage = ""
 
+    def _getCommand(self,commandlist):
+        return " ".join(map(lambda x:'"%s"'%x if " " in x else x,commandlist))
+
+    def runChroot(self,chroot,command):
+        """Run command in chroot specified by cl_assemble_path"""
+        try:
+            envdict = {'CHROOT':"on"}
+            envdict.update(os.environ)
+            commandLine = ["chroot",chroot,
+                                "/bin/bash","-c",command]
+            chrootCommand = process(*commandLine,stderr=PIPE,
+                                stdout=PIPE,envdict=envdict)
+        except KeyboardInterrupt:
+            chrootCommand.kill()
+            raise BuilderError(
+                _("An interrupt occurred during the command executing")+
+                  ":\n    %s"%self._getCommand(chrootCommand.command))
+        return chrootCommand
+
+    def cleanNeedlessKernelData(self, distrPath):
+        """Cleaning needless kernel files from /boot,/lib/modules,/usr/src"""
+        self.printMessageForTest(_("Cleaning %s directory")% "/boot")
+        bootDir = path.join(distrPath, "boot")
+        modulesDir = path.join(distrPath, "lib/modules")
+        reTrash =re.compile("^(?:config|initramfs|vmlinuz|System.map)")
+        rightKernelFiles = \
+            [self.clVars.Get('cl_builder_initrd_install'),
+             self.clVars.Get('cl_builder_kernel'),
+             self.clVars.Get('cl_builder_kernel_config'),
+             self.clVars.Get('cl_builder_kernel_systemmap')]
+        delFiles = filter(lambda x: not x in rightKernelFiles,
+                          filter(reTrash.search,
+                                 os.listdir(bootDir)))
+        map(lambda x:os.unlink(path.join(bootDir,x)),delFiles)
+        self.printByResult(True)
+        self.printMessageForTest(_("Cleaning %s directory") % "/lib/modules")
+        reKernelVer = re.compile(" version (\S+)\s",re.S)
+        ftype = typeFile(magic=0x4).getMType
+        resReg = reKernelVer.search(ftype(path.join(bootDir,
+                    self.clVars.Get('cl_builder_kernel'))))
+        if resReg:
+            kernelVersion = resReg.groups()[0]
+            map(lambda x:removeDir(path.join(modulesDir,x)),
+                filter(lambda x:x != kernelVersion,
+                       os.listdir(modulesDir)))
+            self.printByResult(True)
+            self.printMessageForTest(_("Cleaning %s directory")% "/usr/src")
+            removeKernelSources = filter(lambda x:x and x != "/usr/src/linux",
+                   self.runChroot(distrPath,"qfile -o /usr/src/*"))
+            map(lambda x:removeDir(path.join(distrPath,x)),
+                removeKernelSources)
+            self.printByResult(True)
+
     def prepareSourceDistributive(self,distr):
         """Unmount all bind,proc mount points from source distribute"""
         mp = self.clVars.Get('cl_builder_path')
@@ -168,7 +222,9 @@ class cl_builder(color_print):
             if umountProcess.failed():
                 raise AssembleError(_("Can not umount %s")%target)
             self.printByResult(True)
-        self.applyTemplatesForSquash(distr.convertToDirectory().getDirectory())
+        distrPath = distr.convertToDirectory().getDirectory()
+        self.cleanNeedlessKernelData(distrPath)
+        self.applyTemplatesForSquash(distrPath)
 
     def isoPrepacking(self,directory):
         self.printByResult(True)