mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 03:32:12 +02:00
lib/oe/recipeutils.py: add support for BBFILES_DYNAMIC
Instead of relying on value of BBFILES from bitbake, devtool parses the layer.conf because the layer might not be in bblayers.conf. And it currently does not consider the value of BBFILES_DYNAMIC because of which recipes, in paths defined by BBFILES_DYNAMIC, upgraded using devtool end up in wrong location. Include the code from bitbake to append values to BBFILES based on what is in BBFILES_DYNAMIC too. (From OE-Core rev: c7bbb98ea8ccd3568dd8bded6e404e2f781e6841) Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
15c61b684c
commit
3204982fd7
@@ -563,6 +563,23 @@ def get_bbfile_path(d, destdir, extrapathhint=None):
|
||||
confdata = bb.cookerdata.parse_config_file(destlayerconf, confdata)
|
||||
pn = d.getVar('PN')
|
||||
|
||||
# Parse BBFILES_DYNAMIC and append to BBFILES
|
||||
bbfiles_dynamic = (confdata.getVar('BBFILES_DYNAMIC') or "").split()
|
||||
collections = (confdata.getVar('BBFILE_COLLECTIONS') or "").split()
|
||||
invalid = []
|
||||
for entry in bbfiles_dynamic:
|
||||
parts = entry.split(":", 1)
|
||||
if len(parts) != 2:
|
||||
invalid.append(entry)
|
||||
continue
|
||||
l, f = parts
|
||||
invert = l[0] == "!"
|
||||
if invert:
|
||||
l = l[1:]
|
||||
if (l in collections and not invert) or (l not in collections and invert):
|
||||
confdata.appendVar("BBFILES", " " + f)
|
||||
if invalid:
|
||||
return None
|
||||
bbfilespecs = (confdata.getVar('BBFILES') or '').split()
|
||||
if destdir == destlayerdir:
|
||||
for bbfilespec in bbfilespecs:
|
||||
|
||||
Reference in New Issue
Block a user