summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-02-17 14:07:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-17 15:34:45 +0000
commita56bd812a7204b74abfe413234f16c4bf9b86bfb (patch)
treeb76481c86971c08bbed04399aae8abe0fca231a0
parente469b0afafbf9e2570bcd3d147e694b66dd03b7d (diff)
downloadpoky-a56bd812a7204b74abfe413234f16c4bf9b86bfb.tar.gz
poky-a56bd812a7204b74abfe413234f16c4bf9b86bfb.tar.bz2
poky-a56bd812a7204b74abfe413234f16c4bf9b86bfb.zip
bitbake: parse: make vars_from_file return None for non-recipes
It doesn't really make sense to set PN from .conf files, for example. More concretely, this avoids the config hash changing unnecessarily within Hob due to PN effectively changing (since bblayers.conf is parsed first and then .hob.conf). (Bitbake rev: 22e03ef7ac9bb6b7245250347ae9c10c19f1d74e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/parse/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 97983c9880..e4a44dda11 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -127,7 +127,7 @@ def resolve_file(fn, d):
# Used by OpenEmbedded metadata
__pkgsplit_cache__={}
def vars_from_file(mypkg, d):
- if not mypkg:
+ if not mypkg or not mypkg.endswith((".bb", ".bbappend")):
return (None, None, None)
if mypkg in __pkgsplit_cache__:
return __pkgsplit_cache__[mypkg]