diff options
author | Julien Stephan <jstephan@baylibre.com> | 2023-12-05 15:56:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-06 22:55:50 +0000 |
commit | bc9291c5fd2514adbb598da425ab82b80838f8b6 (patch) | |
tree | e785a9396926f3aff3a9dc1b58d92f4e1da85927 /scripts/lib/recipetool/append.py | |
parent | 0ae9cf237394488508d80e7d08edd284c0075ff6 (diff) | |
download | poky-bc9291c5fd2514adbb598da425ab82b80838f8b6.tar.gz |
recipetool: appendsrcfile(s): add a mode to update the recipe itself
Add a new option -u/--update-recipe to update the recipe itself instead
of creating/updating a bbappend file
(From OE-Core rev: c9a80f55ed0bf9ce249205d6a9ba670fbb7f59ba)
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/recipetool/append.py')
-rw-r--r-- | scripts/lib/recipetool/append.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index fc3cc4a0b7..341e893305 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -357,7 +357,9 @@ def appendsrc(args, files, rd, extralines=None): | |||
357 | dry_run_outdir = dry_run_output.name | 357 | dry_run_outdir = dry_run_output.name |
358 | 358 | ||
359 | appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines, params=params, | 359 | appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines, params=params, |
360 | redirect_output=dry_run_outdir) | 360 | redirect_output=dry_run_outdir, update_original_recipe=args.update_recipe) |
361 | if not appendfile: | ||
362 | return | ||
361 | if args.dry_run: | 363 | if args.dry_run: |
362 | output = '' | 364 | output = '' |
363 | appendfilename = os.path.basename(appendfile) | 365 | appendfilename = os.path.basename(appendfile) |
@@ -459,6 +461,7 @@ def register_commands(subparsers): | |||
459 | help='Create/update a bbappend to add or replace source files', | 461 | help='Create/update a bbappend to add or replace source files', |
460 | description='Creates a bbappend (or updates an existing one) to add or replace the specified file in the recipe sources, either those in WORKDIR or those in the source tree. This command lets you specify multiple files with a destination directory, so cannot specify the destination filename. See the `appendsrcfile` command for the other behavior.') | 462 | description='Creates a bbappend (or updates an existing one) to add or replace the specified file in the recipe sources, either those in WORKDIR or those in the source tree. This command lets you specify multiple files with a destination directory, so cannot specify the destination filename. See the `appendsrcfile` command for the other behavior.') |
461 | parser.add_argument('-D', '--destdir', help='Destination directory (relative to S or WORKDIR, defaults to ".")', default='', type=destination_path) | 463 | parser.add_argument('-D', '--destdir', help='Destination directory (relative to S or WORKDIR, defaults to ".")', default='', type=destination_path) |
464 | parser.add_argument('-u', '--update-recipe', help='Update recipe instead of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to update', action='store_true') | ||
462 | parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true') | 465 | parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true') |
463 | parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to be added to the recipe sources (WORKDIR or S)', type=existing_path) | 466 | parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to be added to the recipe sources (WORKDIR or S)', type=existing_path) |
464 | parser.set_defaults(func=lambda a: appendsrcfiles(parser, a), parserecipes=True) | 467 | parser.set_defaults(func=lambda a: appendsrcfiles(parser, a), parserecipes=True) |
@@ -467,6 +470,7 @@ def register_commands(subparsers): | |||
467 | parents=[common_src], | 470 | parents=[common_src], |
468 | help='Create/update a bbappend to add or replace a source file', | 471 | help='Create/update a bbappend to add or replace a source file', |
469 | description='Creates a bbappend (or updates an existing one) to add or replace the specified files in the recipe sources, either those in WORKDIR or those in the source tree. This command lets you specify the destination filename, not just destination directory, but only works for one file. See the `appendsrcfiles` command for the other behavior.') | 472 | description='Creates a bbappend (or updates an existing one) to add or replace the specified files in the recipe sources, either those in WORKDIR or those in the source tree. This command lets you specify the destination filename, not just destination directory, but only works for one file. See the `appendsrcfiles` command for the other behavior.') |
473 | parser.add_argument('-u', '--update-recipe', help='Update recipe instead of creating (or updating) a bbapend file. DESTLAYER must contains the recipe to update', action='store_true') | ||
470 | parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true') | 474 | parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true') |
471 | parser.add_argument('file', metavar='FILE', help='File to be added to the recipe sources (WORKDIR or S)', type=existing_path) | 475 | parser.add_argument('file', metavar='FILE', help='File to be added to the recipe sources (WORKDIR or S)', type=existing_path) |
472 | parser.add_argument('destfile', metavar='DESTFILE', nargs='?', help='Destination path (relative to S or WORKDIR, optional)', type=destination_path) | 476 | parser.add_argument('destfile', metavar='DESTFILE', nargs='?', help='Destination path (relative to S or WORKDIR, optional)', type=destination_path) |