summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-03-07 14:48:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 15:04:50 +0000
commite41aa22d7938c200f4150155589f5e23ed0331ce (patch)
tree40ff64400249612ea479059e7db39efceea6a7ea
parent954e7050f602acf3dd401ca84a1b9a3b78b0ca28 (diff)
downloadopenembedded-core-e41aa22d7938c200f4150155589f5e23ed0331ce.tar.gz
openembedded-core-e41aa22d7938c200f4150155589f5e23ed0331ce.tar.bz2
openembedded-core-e41aa22d7938c200f4150155589f5e23ed0331ce.zip
classes/uboot-config: ignore doc varflag
The doc varflag on UBOOT_CONFIG should be ignored by this code; without this the recent addition of the UBOOT_CONFIG[doc] to documentation.conf causes errors when UBOOT_MACHINE is used. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/uboot-config.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index 3e09f17bbe..8ac1b71bc2 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -14,6 +14,8 @@
python () {
ubootmachine = d.getVar("UBOOT_MACHINE", True)
ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
+ # The "doc" varflag is special, we don't want to see it here
+ ubootconfigflags.pop('doc', None)
if not ubootmachine and not ubootconfigflags:
PN = d.getVar("PN", True)