mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

externalsrc/devtool: Fix to work with fixed export funcition flags handling

Browse Source 
If we fix bitbake to correctly handle the cleandirs and fakeroot flags
for tasks handled by EXPORT_FUNCTIONS, we break devtool since it only
considers these for top level functions. Add in extra code to intercept
the cleandirs flags for commonly used sub functions too.

[YOCTO #8621]

(From OE-Core rev: 67fad829f37ed0a8e20c599d2b65635158591d06)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2022-04-11 23:02:26 +01:00
parent 9fc670b6a1
commit 9dff569a07
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
meta/classes/externalsrc.bbclass
View File

@@ -90,15 +90,16 @@ python () {
# Since configure will likely touch ${S}, ensure only we lock so one task has access at a time # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time
d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock") d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock")
# We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean) for funcname in [task, "base_" + task, "kernel_" + task]:
cleandirs = oe.recipeutils.split_var_value(d.getVarFlag(task, 'cleandirs', False) or '') # We do not want our source to be wiped out, ever (kernel.bbclass does this for do_clean)
setvalue = False cleandirs = oe.recipeutils.split_var_value(d.getVarFlag(funcname, 'cleandirs', False) or '')
for cleandir in cleandirs[:]: setvalue = False
if oe.path.is_path_parent(externalsrc, d.expand(cleandir)): for cleandir in cleandirs[:]:
cleandirs.remove(cleandir) if oe.path.is_path_parent(externalsrc, d.expand(cleandir)):
setvalue = True cleandirs.remove(cleandir)
if setvalue: setvalue = True
d.setVarFlag(task, 'cleandirs', ' '.join(cleandirs)) if setvalue:
d.setVarFlag(funcname, 'cleandirs', ' '.join(cleandirs))
fetch_tasks = ['do_fetch', 'do_unpack'] fetch_tasks = ['do_fetch', 'do_unpack']
# If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one # If we deltask do_patch, there's no dependency to ensure do_unpack gets run, so add one