[oe-commits] Paul Eggleton : classes/uboot-config: ignore doc varflag

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e41aa22d7938c200f4150155589f5e23ed0331ce
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e41aa22d7938c200f4150155589f5e23ed0331ce

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri Mar  7 14:48:48 2014 +0000

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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/uboot-config.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index 3e09f17..8ac1b71 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)