Добавлена возможность перенастроить темы перед запаковкой iso образа

pym/builder/builder.py

@@ -197,7 +197,8 @@ class Builder(Update):
 
     def apply_templates(self, target=None, useClt=None, cltFilter=False,
                         root=None,
-                        useDispatch=True, action="merge", distro_dv=None):
+                        useDispatch=True, action="merge", distro_dv=None,
+                        themes=False):
         """
         Применить шаблоны.
 
@@ -261,6 +262,13 @@ class Builder(Update):
             nullProgress = lambda *args, **kw: None
             dispatch = self.dispatchConf if useDispatch else None
 
+            if themes:
+                for k, v in {'cl_action': 'merge',
+                             'cl_merge_pkg': [None],
+                             'cl_merge_set': "on",
+                             'install.cl_setup': 'themes'}.items():
+                    clVars.Set(k, v, force=True)
+
             clTempl = ProgressTemplate(nullProgress, clVars,
                                        cltObj=useClt,
                                        cltFilter=cltFilter,
@@ -1573,3 +1581,22 @@ class Builder(Update):
             self.pkgnum = None
 
         return True
+
+    def update_dracut(self, builder_path):
+        """
+        Обновить initramfs
+        :param builder_path:
+        :return:
+        """
+        cmd = "/usr/bin/dracut"
+        cmd_path = self.get_prog_path(cmd)
+        logfile = self._get_log_file()
+        if not cmd_path:
+            raise BuilderError(_("Failed to find the %s command") % cmd)
+        kver = self.clVars.Get("builder.cl_builder_kernel_ver")
+        dracut = self.chrootize(
+            builder_path,
+            CommandExecutor(cmd_path, ["--xz", "-f", "--kver", kver],
+                            logfile=logfile))
+        dracut.execute()
+        return dracut.success()

pym/builder/utils/cl_builder_image.py

@@ -74,6 +74,14 @@ class ClBuilderImageAction(Action):
          'message': __("Configuring build"),
          'method': 'Builder.applyTemplates(cl_builder_target,False,False,None)',
          },
+        # обновить темы
+        {'name': 'update_themes',
+         'message': __("Updating themes"),
+         'method': 'Builder.apply_templates(cl_builder_path,'
+                   'cl_template_clt_set,True,None,False,"merge",'
+                   'cl_builder_linux_datavars,True)',
+         'condition': lambda Get: Get("cl_builder_update_themes_set") == 'on'
+         },
         {'name': 'prelink',
          'message': __("Executing prelink"),
          'method': 'Builder.chroot_command(cl_builder_path,"prelink",'
@@ -83,6 +91,12 @@ class ClBuilderImageAction(Action):
         {'name': 'reconfigure_vars1',
          'method': 'Builder.invalidateVariables("cl_builder_linux_datavars")',
          },
+        # обновить темы
+        {'name': 'update_dracut',
+         'message': __("Updating initramfs"),
+         'method': 'Builder.update_dracut(cl_builder_path)',
+         'condition': lambda Get: Get("cl_builder_update_themes_set") == 'on'
+         },
         # получить видеодрайверы
         {'name': 'fetch_video_drivers',
          'group': __("Fetching video drivers"),

pym/builder/variables/builder.py

@@ -1700,3 +1700,16 @@ class VariableClBuilderCheckAutomagicSet(Variable):
         self.label = _("Check for auto depends")
         self.help = _("check for auto depends")
 
+
+class VariableClBuilderUpdateThemesSet(Variable):
+    """
+    Перенастроить темы перед запаковкой
+    """
+    type = "bool"
+    value = "off"
+
+    opt = ["--update-themes", "-U"]
+
+    def init(self):
+        self.label = _("Update themes")
+        self.help = _("update themes")

pym/builder/wsdl_builder.py

@@ -374,6 +374,7 @@ class Wsdl(WsdlBase):
                                            'cl_builder_isohybrid_set',
                                            'cl_builder_keep_tree_set',
                                            'cl_builder_prelink_set',
+                                           'cl_builder_update_themes_set',
                                            'cl_builder_prepare_free_size',
                                            'cl_builder_image_free_size'
                                            ),
@@ -384,6 +385,7 @@ class Wsdl(WsdlBase):
                                           'cl_builder_image_filename',
                                           'cl_builder_videodrv_set',
                                           'cl_builder_compress',
+                                          'cl_builder_update_themes_set',
                                           'cl_builder_keep_tree_set',
                                           'cl_builder_isohybrid_set',
                                           'cl_builder_prelink_set',
@@ -397,6 +399,7 @@ class Wsdl(WsdlBase):
                                         'cl_builder_prelink_set',
                                         'cl_builder_compress',
                                         'cl_builder_binhost_stable_set',
+                                        'cl_builder_update_themes_set',
                                         'cl_templates_locate',
                                         'cl_verbose_set',
                                         'cl_dispatch_conf'),