summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2018-10-10 12:34:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-18 10:59:26 +0100
commit212cbc038270bc12e239e9e3b0da3a173a698c77 (patch)
tree5a2615496c5f0c8855058aca9fee4ee406d7a351
parentf2a6f6e80e11511216e04234a27f51a04b46fc0b (diff)
downloadpoky-212cbc038270bc12e239e9e3b0da3a173a698c77.tar.gz
bitbake: fetch2: avoid circular recursion with SRCPV in PR
Some recent changes broke SRCPV and workaround was introduced to avoid circular dependency if SRCPV is in PV. However there is still the same error if SRCPV is in PR. (Bitbake rev: 05ee4845f925b8528a7ce9cffb4bae425b8fa1e9) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index a83526a5d0..cb2f325a83 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -837,14 +837,16 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None):
837 if not cleanup: 837 if not cleanup:
838 cleanup = [] 838 cleanup = []
839 839
840 # If PATH contains WORKDIR which contains PV which contains SRCPV we 840 # If PATH contains WORKDIR which contains PV-PR which contains SRCPV we
841 # can end up in circular recursion here so give the option of breaking it 841 # can end up in circular recursion here so give the option of breaking it
842 # in a data store copy. 842 # in a data store copy.
843 try: 843 try:
844 d.getVar("PV") 844 d.getVar("PV")
845 d.getVar("PR")
845 except bb.data_smart.ExpansionError: 846 except bb.data_smart.ExpansionError:
846 d = bb.data.createCopy(d) 847 d = bb.data.createCopy(d)
847 d.setVar("PV", "fetcheravoidrecurse") 848 d.setVar("PV", "fetcheravoidrecurse")
849 d.setVar("PR", "fetcheravoidrecurse")
848 850
849 origenv = d.getVar("BB_ORIGENV", False) 851 origenv = d.getVar("BB_ORIGENV", False)
850 for var in exportvars: 852 for var in exportvars: