From 3dea09570a0978e74c50d57efedb96ff97889e69 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 20 Jun 2017 19:47:34 +0100 Subject: bitbake: cache: don't insert PN into PACKAGES The cache code currently inserts PN into the package list if it isn't already present. Whilst this ensures that the package list contains something which is important for native recipes that don't set PACKAGES, it causes confusing behaviour where a normal recipe doesn't have PN in PACKAGES: for example adding dhcp to IMAGE_INSTALL will parse successfully but fail at rootfs time as the dhcp recipe doesn't generate a dhcp package. Solve this by only adding PN to the cache's package list if the package list is empty. This results in the package list for recipes such as DHCP being correct, but native recipes continue to have just PN in the list as before. [ YOCTO #5533 ] (Bitbake rev: df31a88786ce5bd7708ff14e1379dc2a58a8c0cf) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/cache.py') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index e7eeb4f505..514399269a 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -107,7 +107,7 @@ class CoreRecipeInfo(RecipeInfoCommon): self.pn = self.getvar('PN', metadata) self.packages = self.listvar('PACKAGES', metadata) - if not self.pn in self.packages: + if not self.packages: self.packages.append(self.pn) self.basetaskhashes = self.taskvar('BB_BASEHASH', self.tasks, metadata) @@ -217,7 +217,7 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.packages_dynamic[package].append(fn) # Build hash of runtime depends and recommends - for package in self.packages + [self.pn]: + for package in self.packages: cachedata.rundeps[fn][package] = list(self.rdepends) + self.rdepends_pkg[package] cachedata.runrecs[fn][package] = list(self.rrecommends) + self.rrecommends_pkg[package] -- cgit v1.2.3-54-g00ecf