[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 6/8] recipetool: appendsrcfile(s): add a mode to update the recipe itself
From:       "Julien Stephan" <jstephan () baylibre ! com>
Date:       2023-11-30 22:01:54
Message-ID: 20231130220156.726263-7-jstephan () baylibre ! com
[Download RAW message or body]

Content-Transfer-Encoding: 8bit

Add a new option -u/--update-recipe to update the recipe itself instead
of creating/updating a bbappend file

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 scripts/lib/recipetool/append.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index d7597ca5154..6c4c9183f78 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -356,7 +356,9 @@ def appendsrc(args, files, rd, extralines=None):
         dry_run_output = tempfile.TemporaryDirectory(prefix='devtool')
         dry_run_outdir = dry_run_output.name
 
-    appendfile, _ = oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, \
None, wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines, \
params=params, redirect_output=dry_run_outdir) +    appendfile, _ = \
oe.recipeutils.bbappend_recipe(rd, args.destlayer, copyfiles, None, \
wildcardver=args.wildcard_version, machine=args.machine, extralines=extralines, \
params=params, redirect_output=dry_run_outdir, \
update_original_recipe=args.update_recipe) +    if not appendfile:
+        return
     if args.dry_run:
         output = ''
         appendfilename = os.path.basename(appendfile)
@@ -458,6 +460,7 @@ def register_commands(subparsers):
                                    help='Create/update a bbappend to add or replace \
source files',  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.')
     parser.add_argument('-D', '--destdir', help='Destination directory (relative to \
S or WORKDIR, defaults to ".")', default='', type=destination_path) +    \
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')
     parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true')
     parser.add_argument('files', nargs='+', metavar='FILE', help='File(s) to be \
                added to the recipe sources (WORKDIR or S)', type=existing_path)
     parser.set_defaults(func=lambda a: appendsrcfiles(parser, a), parserecipes=True)
@@ -466,6 +469,7 @@ def register_commands(subparsers):
                                    parents=[common_src],
                                    help='Create/update a bbappend to add or replace \
a source file',  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.') +    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')
     parser.add_argument('-n', '--dry-run', help='Dry run mode', action='store_true')
     parser.add_argument('file', metavar='FILE', help='File to be added to the recipe \
                sources (WORKDIR or S)', type=existing_path)
     parser.add_argument('destfile', metavar='DESTFILE', nargs='?', help='Destination \
                path (relative to S or WORKDIR, optional)', type=destination_path)
-- 
2.42.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191550): https://lists.openembedded.org/g/openembedded-core/message/191550
Mute This Topic: https://lists.openembedded.org/mt/102903937/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]