Patchwork classes/uboot-config: ignore doc varflag

login
register
mail settings
Submitter Paul Eggleton
Date March 7, 2014, 2:48 p.m.
Message ID <1394203728-12471-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/68263/
State Accepted
Commit abe417e22b1b55c444460f722ca434f9d382ef87
Headers show

Comments

Paul Eggleton - March 7, 2014, 2:48 p.m.
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>
---
 meta/classes/uboot-config.bbclass | 2 ++
 1 file changed, 2 insertions(+)
Otavio Salvador - March 7, 2014, 9:46 p.m.
On Fri, Mar 7, 2014 at 11:48 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> 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>

Acked-by: Otavio Salvador <otavio@ossystems.com.br>

Patch

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)