devtool: make plugin_init optional

So far all devtool and recipetool plugins were expected
to have plugin_init function. This function is empty in
most of plugins as they don't require initialisation.

Making plugin_init optional would allow not having empty
plugin_init in every plugin.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/scripts/lib/devtool/build-image.py b/scripts/lib/devtool/build-image.py
index 817703a0e5c24c148025f0234c6be27a4aa9655b..2c014289feb7042394f5aad3cc294af8464d1b91 100644 (file)
--- a/scripts/lib/devtool/build-image.py
+++ b/scripts/lib/devtool/build-image.py
@@ -25,10 +25,6 @@ from devtool import exec_build_env_command, setup_tinfoil, parse_recipe
 
 logger = logging.getLogger('devtool')
 
-def plugin_init(pluginlist):
-    """Plugin initialization"""
-    pass
-
 def _get_recipes(workspace, config):
     """Get list of target recipes from the workspace."""
     result = []

diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 448db9637d5912a16f0df532696c9c1d0b3664f9..fa93adf18196ccfd518a13697debf1a01cc997c5 100644 (file)
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -23,11 +23,6 @@ from devtool import exec_fakeroot, setup_tinfoil, DevtoolError
 
 logger = logging.getLogger('devtool')
 
-def plugin_init(pluginlist):
-    """Plugin initialization"""
-    pass
-
-
 def deploy(args, config, basepath, workspace):
     """Entry point for the devtool 'deploy' subcommand"""
     import re

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 4702491fe02756c2faf573e5fbc961a3e45e9c09..5263af56c856c1f4ed8397d9f6642ab12d3287ff 100644 (file)
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -31,11 +31,6 @@ from devtool import parse_recipe
 logger = logging.getLogger('devtool')
 
 
-def plugin_init(pluginlist):
-    """Plugin initialization"""
-    pass
-
-
 def add(args, config, basepath, workspace):
     """Entry point for the devtool 'add' subcommand"""
     import bb

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index ed7d0d4b275b741cc81cc31752354e4341a5c852..7fe411520accfaa9a9fa925137b879b0df3874a6 100644 (file)
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -33,10 +33,6 @@ logger = logging.getLogger('recipetool')
 
 tinfoil = None
 
-def plugin_init(pluginlist):
-    # Don't need to do anything here right now, but plugins must have this function defined
-    pass
-
 def tinfoil_init(instance):
     global tinfoil
     tinfoil = instance

diff --git a/scripts/lib/recipetool/create_buildsys.py b/scripts/lib/recipetool/create_buildsys.py
index 6c9e0efa2a651b725cc3fc394a15a455183ea7b1..ed14a5330416b6198b550356cf1523df5396184f 100644 (file)
--- a/scripts/lib/recipetool/create_buildsys.py
+++ b/scripts/lib/recipetool/create_buildsys.py
@@ -307,9 +307,6 @@ class MakefileRecipeHandler(RecipeHandler):
             self.genfunction(lines_after, 'do_install', ['# Specify install commands here'])
 
 
-def plugin_init(pluginlist):
-    pass
-
 def register_recipe_handlers(handlers):
     # These are in a specific order so that the right one is detected first
     handlers.append(CmakeRecipeHandler())

diff --git a/scripts/lib/recipetool/create_buildsys_python.py b/scripts/lib/recipetool/create_buildsys_python.py
index f4f4212559b400c49a7cf83ebb62b18e791326d3..e0af2a0f51a808c45c8340bfd5e5ec06a9f60f10 100644 (file)
--- a/scripts/lib/recipetool/create_buildsys_python.py
+++ b/scripts/lib/recipetool/create_buildsys_python.py
@@ -711,10 +711,6 @@ def has_non_literals(value):
         return any(has_non_literals(v) for v in value)
 
 
-def plugin_init(pluginlist):
-    pass
-
-
 def register_recipe_handlers(handlers):
     # We need to make sure this is ahead of the makefile fallback handler
     handlers.insert(0, PythonRecipeHandler())

diff --git a/scripts/lib/scriptutils.py b/scripts/lib/scriptutils.py
index 5d103a58fe29900d8dad375a440a8bd5f8504ec5..33668826351c96d24c026eccdecdfc76556ed77c 100644 (file)
--- a/scripts/lib/scriptutils.py
+++ b/scripts/lib/scriptutils.py
@@ -57,7 +57,7 @@ def load_plugins(logger, plugins, pluginpath):
             plugin = load_plugin(name)
             if hasattr(plugin, 'plugin_init'):
                 plugin.plugin_init(plugins)
-                plugins.append(plugin)
+            plugins.append(plugin)
 
 def git_convert_standalone_clone(repodir):
     """If specified directory is a git repository, ensure it's a standalone clone"""