[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6318/8267] uboot-config: check UBOOT_CONFIG variable, not flags, for error conditions

[Emmanuele Bassi <ebassi src gnome org>]

commit eee3227bad8159899d309443734e55a6c289012a
Author: Denys Dmytriyenko <denys ti com>
Date:   Mon Jun 12 14:47:49 2017 -0400

    uboot-config: check UBOOT_CONFIG variable, not flags, for error conditions
    
    Sometimes there's a need to change existing UBOOT_CONFIG setting from a recipe,
    distro or local config, such as an override or even switch back to UBOOT_MACHINE.
    Unfortunately, there's no easy way to override or unset flags, so using them as
    an error condition is rather heavy-handed. Change those conditions to check the
    UBOOT_CONFIG variable itself, not its flags.
    
    (From OE-Core rev: b51383e5268ff33e43a39862814e065afbbd10ca)
    
    Signed-off-by: Denys Dmytriyenko <denys ti com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/uboot-config.bbclass |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass
index 10013b7..533e175 100644
--- a/meta/classes/uboot-config.bbclass
+++ b/meta/classes/uboot-config.bbclass
@@ -20,24 +20,21 @@ python () {
     ubootbinaries = d.getVar('UBOOT_BINARIES')
     # The "doc" varflag is special, we don't want to see it here
     ubootconfigflags.pop('doc', None)
+    ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
 
-    if not ubootmachine and not ubootconfigflags:
+    if not ubootmachine and not ubootconfig:
         PN = d.getVar("PN")
         FILE = os.path.basename(d.getVar("FILE"))
         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"))
 
-    if ubootmachine and ubootconfigflags:
+    if ubootmachine and ubootconfig:
         raise bb.parse.SkipPackage("You cannot use UBOOT_MACHINE and UBOOT_CONFIG at the same time.")
 
     if ubootconfigflags and ubootbinaries:
         raise bb.parse.SkipPackage("You cannot use UBOOT_BINARIES as it is internal to 
uboot_config.bbclass.")
 
-    if not ubootconfigflags:
-        return
-
-    ubootconfig = (d.getVar('UBOOT_CONFIG') or "").split()
     if len(ubootconfig) > 0:
         for config in ubootconfig:
             for f, v in ubootconfigflags.items():
@@ -57,6 +54,4 @@ python () {
                         bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
                         d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
                     break
-    elif len(ubootconfig) == 0:
-       raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.')
 }