On Fri, May 2, 2014 at 11:08 AM, Alex J Lennon
<ajlen...@dynamicdevices.co.uk> wrote:
>
> On 02/05/2014 14:25, Otavio Salvador wrote:
>> On Fri, May 2, 2014 at 10:23 AM, Otavio Salvador
> So thanks again for the advice. I think we've cracked it :)
Could you try the attached patch over Poky?
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
From 0b0a3f669f7d8beb626729d85e2cba5d85f3e2c0 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <ota...@ossystems.com.br>
Date: Fri, 2 May 2014 12:20:28 -0300
Subject: [PATCH] uboot-config.bbclass: Fix checking of non-setted values in
UBOOT_CONFIG
Organization: O.S. Systems Software LTDA.
The code were mistakenly checking for UBOOT_CONFIG flags instead of
UBOOT_CONFIG value when verifying for duplicated setting, this made it
hard to be overriden in case it was need in subsequent layers.
Reported-by: Alex J Lennon <ajlen...@dynamicdevices.co.uk>
Signed-off-by: Otavio Salvador <ota...@ossystems.com.br>
---
meta/classes/uboot-config.bbclass | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index 8ac1b71..3c48657 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -13,24 +13,25 @@
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)
+ ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split()
- if not ubootmachine and not ubootconfigflags:
+ if not ubootmachine and not ubootconfig:
PN = d.getVar("PN", True)
FILE = os.path.basename(d.getVar("FILE", True))
bb.debug(1, "To build %s, see %s for instructions on \
setting up your machine config" % (PN, FILE))
raise bb.parse.SkipPackage("Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the %s machine configuration." % d.getVar("MACHINE", True))
- if ubootmachine and ubootconfigflags:
+ if ubootmachine and ubootconfig:
raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.")
+ ubootconfigflags = d.getVarFlags('UBOOT_CONFIG')
+ # The "doc" varflag is special, we don't want to see it here
+ ubootconfigflags.pop('doc', None)
+
if not ubootconfigflags:
return
- ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split()
if len(ubootconfig) > 1:
raise bb.parse.SkipPackage('You can only have a single default for UBOOT_CONFIG.')
elif len(ubootconfig) == 0:
--
2.0.0.rc0
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
