summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-21 16:08:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:33:55 +0000
commit9538ee9191a1d3a2ebcf0f8d329509b43cec29c9 (patch)
tree898d9e41acf1d6cd93d1a1a6b6412b734fa7d49f
parent4eb3ffe5714b9beacc6a5f5373549aa640095983 (diff)
downloadpoky-9538ee9191a1d3a2ebcf0f8d329509b43cec29c9.tar.gz
bitbake: cooker: Use expanded_data for ASSUME_PROVIDED
Users expect operators like _remove to work on this variable. We need to use expanded_data to ensure this happens correctly. [YOCTO #7135] (Bitbake rev: cc4c8478fc547ea0ebf827a8d319496b39f25684) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a7560a17d0..f77c6c0532 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -564,7 +564,7 @@ class BBCooker:
564 fn = self.matchFile(fn) 564 fn = self.matchFile(fn)
565 fn = bb.cache.Cache.realfn2virtual(fn, cls) 565 fn = bb.cache.Cache.realfn2virtual(fn, cls)
566 elif len(pkgs_to_build) == 1: 566 elif len(pkgs_to_build) == 1:
567 ignore = self.data.getVar("ASSUME_PROVIDED", True) or "" 567 ignore = self.expanded_data.getVar("ASSUME_PROVIDED", True) or ""
568 if pkgs_to_build[0] in set(ignore.split()): 568 if pkgs_to_build[0] in set(ignore.split()):
569 bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0]) 569 bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0])
570 570
@@ -1484,7 +1484,7 @@ class BBCooker:
1484 if len(pkgs_to_build) == 0: 1484 if len(pkgs_to_build) == 0:
1485 raise NothingToBuild 1485 raise NothingToBuild
1486 1486
1487 ignore = (self.data.getVar("ASSUME_PROVIDED", True) or "").split() 1487 ignore = (self.expanded_data.getVar("ASSUME_PROVIDED", True) or "").split()
1488 for pkg in pkgs_to_build: 1488 for pkg in pkgs_to_build:
1489 if pkg in ignore: 1489 if pkg in ignore:
1490 parselog.warn("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg) 1490 parselog.warn("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg)