summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-22 19:55:45 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:05 (GMT)
commit0cc381029936f34da30a65122c6d952954e07178 (patch)
treec59ecc75425d7a497f94cacda79fa444e02d76e5 /scripts
parentb381f804a541bb1d08e331c139a82e250f924c05 (diff)
downloadpoky-0cc381029936f34da30a65122c6d952954e07178.tar.gz
recipetool: make plugin registration function name consistent with devtool
This should have been register_commands rather than register_command; I used register_commands in devtool so lets change this here to be consistent with that. (Since this is extensible through layers though we need to remain compatible with the old name, so fall back to that if the new function name isn't there.) (From OE-Core rev: 1047f6592ac81643cd847f104da766dc4a4c81ea) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/recipetool/append.py2
-rw-r--r--scripts/lib/recipetool/create.py2
-rw-r--r--scripts/lib/recipetool/newappend.py2
-rw-r--r--scripts/lib/recipetool/setvar.py2
-rwxr-xr-xscripts/recipetool6
5 files changed, 9 insertions, 5 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 867d55a..558fd25 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -435,7 +435,7 @@ def target_path(targetpath):
435 return targetpath 435 return targetpath
436 436
437 437
438def register_command(subparsers): 438def register_commands(subparsers):
439 common = argparse.ArgumentParser(add_help=False) 439 common = argparse.ArgumentParser(add_help=False)
440 common.add_argument('-m', '--machine', help='Make bbappend changes specific to a machine only', metavar='MACHINE') 440 common.add_argument('-m', '--machine', help='Make bbappend changes specific to a machine only', metavar='MACHINE')
441 common.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true') 441 common.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true')
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 15aa9bd..2d75046 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -436,7 +436,7 @@ def convert_debian(debpath):
436 return values 436 return values
437 437
438 438
439def register_command(subparsers): 439def register_commands(subparsers):
440 parser_create = subparsers.add_parser('create', 440 parser_create = subparsers.add_parser('create',
441 help='Create a new recipe', 441 help='Create a new recipe',
442 description='Creates a new recipe from a source tree') 442 description='Creates a new recipe from a source tree')
diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py
index 4eeac0e..f9b8d85 100644
--- a/scripts/lib/recipetool/newappend.py
+++ b/scripts/lib/recipetool/newappend.py
@@ -97,7 +97,7 @@ def newappend(args):
97 print(append_path) 97 print(append_path)
98 98
99 99
100def register_command(subparsers): 100def register_commands(subparsers):
101 parser = subparsers.add_parser('newappend', 101 parser = subparsers.add_parser('newappend',
102 help='Create a bbappend for the specified target in the specified layer') 102 help='Create a bbappend for the specified target in the specified layer')
103 parser.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true') 103 parser.add_argument('-w', '--wildcard-version', help='Use wildcard to make the bbappend apply to any recipe version', action='store_true')
diff --git a/scripts/lib/recipetool/setvar.py b/scripts/lib/recipetool/setvar.py
index 18e3281..657d2b6 100644
--- a/scripts/lib/recipetool/setvar.py
+++ b/scripts/lib/recipetool/setvar.py
@@ -62,7 +62,7 @@ def setvar(args):
62 return 0 62 return 0
63 63
64 64
65def register_command(subparsers): 65def register_commands(subparsers):
66 parser_setvar = subparsers.add_parser('setvar', 66 parser_setvar = subparsers.add_parser('setvar',
67 help='Set a variable within a recipe', 67 help='Set a variable within a recipe',
68 description='Adds/updates the value a variable is set to in a recipe') 68 description='Adds/updates the value a variable is set to in a recipe')
diff --git a/scripts/recipetool b/scripts/recipetool
index 4af0bfb..791a66a 100755
--- a/scripts/recipetool
+++ b/scripts/recipetool
@@ -82,7 +82,11 @@ def main():
82 82
83 registered = False 83 registered = False
84 for plugin in plugins: 84 for plugin in plugins:
85 if hasattr(plugin, 'register_command'): 85 if hasattr(plugin, 'register_commands'):
86 registered = True
87 plugin.register_commands(subparsers)
88 elif hasattr(plugin, 'register_command'):
89 # Legacy function name
86 registered = True 90 registered = True
87 plugin.register_command(subparsers) 91 plugin.register_command(subparsers)
88 if hasattr(plugin, 'tinfoil_init'): 92 if hasattr(plugin, 'tinfoil_init'):