[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH 3/8] recipeutils: bbappend_recipe: add a way to specify the name of the file to add
From: "Julien Stephan" <jstephan () baylibre ! com>
Date: 2023-11-30 22:01:51
Message-ID: 20231130220156.726263-4-jstephan () baylibre ! com
[Download RAW message or body]
Content-Transfer-Encoding: 8bit
bbappend_recipe can take a dict of source files to add to SRC_URI where
the key is the full path to the file to be added and the value is
the original file in the recipe space.
Modify the dict value to use a tupple: (originalfile, newname), to allow
specifying the name of the file we would like to add
Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
meta/lib/oe/recipeutils.py | 20 ++++++++++++--------
scripts/lib/devtool/standard.py | 6 +++---
scripts/lib/recipetool/append.py | 4 ++--
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 7465a2d0ab4..9784ae3b031 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -671,12 +671,13 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, \
wildcardver=False, rd: data dictionary for the recipe
destlayerdir: base directory of the layer to place the bbappend in
(subdirectory path from there will be determined automatically)
- srcfiles: dict of source files to add to SRC_URI, where the value
- is the full path to the file to be added, and the value is the
- original filename as it would appear in SRC_URI or None if it
- isn't already present. You may pass None for this parameter if
- you simply want to specify your own content via the extralines
- parameter.
+ srcfiles: dict of source files to add to SRC_URI, where the key
+ is the full path to the file to be added, and the value is a tuple
+ containing the original filename as it would appear in SRC_URI
+ or None if it isn't already present and the new name of the file or
+ None to use by default basename(original filename).
+ You may pass None for this parameter if you simply want to specify
+ your own content via the extralines parameter.
install: dict mapping entries in srcfiles to a tuple of two elements:
install path (*without* ${D} prefix) and permission value (as a
string, e.g. '0644').
@@ -764,11 +765,14 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, \
wildcardver=False, copyfiles = {}
if srcfiles:
instfunclines = []
- for i, (newfile, origsrcfile) in enumerate(srcfiles.items()):
+ for i, (newfile, (origsrcfile, newname)) in enumerate(srcfiles.items()):
srcfile = origsrcfile
srcurientry = None
if not srcfile:
- srcfile = os.path.basename(newfile)
+ if newname:
+ srcfile = newname
+ else:
+ srcfile = os.path.basename(newfile)
srcurientry = 'file://%s' % srcfile
if params and params[i]:
srcurientry = '%s;%s' % (srcurientry, ';'.join('%s=%s' % (k,v) \
for k,v in params[i].items()))
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index d53fb810071..fa473014f90 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1568,7 +1568,7 @@ def _update_recipe_srcrev(recipename, workspace, srctree, rd, \
appendlayerdir, wi update_srcuri = True
if appendlayerdir:
- files = dict((os.path.join(local_files_dir, key), val) for
+ files = dict((os.path.join(local_files_dir, key), (val, None)) for
key, val in list(upd_f.items()) + list(new_f.items()))
removevalues = {}
if update_srcuri:
@@ -1678,9 +1678,9 @@ def _update_recipe_patch(recipename, workspace, srctree, rd, \
appendlayerdir, wil destpath = None
srcuri = (rd.getVar('SRC_URI', False) or '').split()
if appendlayerdir:
- files = OrderedDict((os.path.join(local_files_dir, key), val) for
+ files = OrderedDict((os.path.join(local_files_dir, key), (val, None)) \
for
key, val in list(upd_f.items()) + list(new_f.items()))
- files.update(OrderedDict((os.path.join(patches_dir, key), val) for
+ files.update(OrderedDict((os.path.join(patches_dir, key), (val, None)) \
for
key, val in list(upd_p.items()) + \
list(new_p.items()))) if files or remove_files:
removevalues = None
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py
index 314ff4e20fd..09e314481f1 100644
--- a/scripts/lib/recipetool/append.py
+++ b/scripts/lib/recipetool/append.py
@@ -300,7 +300,7 @@ def appendfile(args):
if st.st_mode & stat.S_IXUSR:
perms = '0755'
install = {args.newfile: (args.targetpath, perms)}
- oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: \
sourcepath}, install, wildcardver=args.wildcard_version, machine=args.machine) + \
oe.recipeutils.bbappend_recipe(rd, args.destlayer, {args.newfile: (None, \
sourcepath)}, install, wildcardver=args.wildcard_version, machine=args.machine) \
tinfoil.modified_files() return 0
else:
@@ -354,7 +354,7 @@ def appendsrc(args, files, rd, extralines=None):
logger.warning('{0!r} is already in SRC_URI, not \
adding'.format(source_uri)) else:
extralines.append('SRC_URI += {0}'.format(source_uri))
- copyfiles[newfile] = srcfile
+ copyfiles[newfile] = (None, srcfile)
dry_run_output = None
dry_run_outdir = None
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191547): https://lists.openembedded.org/g/openembedded-core/message/191547
Mute This Topic: https://lists.openembedded.org/mt/102903933/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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic