diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-03-07 14:48:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 15:05:09 +0000 |
| commit | abe417e22b1b55c444460f722ca434f9d382ef87 (patch) | |
| tree | a7f2e8fdf0839f352195b552eb9da6e628bb1188 /meta/classes | |
| parent | 26b65aa90df35b77a791ca0686e761964c22889e (diff) | |
| download | poky-abe417e22b1b55c444460f722ca434f9d382ef87.tar.gz | |
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.
(From OE-Core rev: e41aa22d7938c200f4150155589f5e23ed0331ce)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/uboot-config.bbclass | 2 |
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 @@ | |||
| 14 | python () { | 14 | python () { |
| 15 | ubootmachine = d.getVar("UBOOT_MACHINE", True) | 15 | ubootmachine = d.getVar("UBOOT_MACHINE", True) |
| 16 | ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') | 16 | ubootconfigflags = d.getVarFlags('UBOOT_CONFIG') |
| 17 | # The "doc" varflag is special, we don't want to see it here | ||
| 18 | ubootconfigflags.pop('doc', None) | ||
| 17 | 19 | ||
| 18 | if not ubootmachine and not ubootconfigflags: | 20 | if not ubootmachine and not ubootconfigflags: |
| 19 | PN = d.getVar("PN", True) | 21 | PN = d.getVar("PN", True) |