[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5709/8267] kernel-arch.bbclass: conditional error message



commit 7f0f7df8b3f699340382b35a4c599b0ac0bcc0f9
Author: Juro Bystricky <juro bystricky intel com>
Date:   Sat Apr 8 11:35:25 2017 -0700

    kernel-arch.bbclass: conditional error message
    
    The single purpose of "map_kernel_arch" is to set
    
       export ARCH = "some-arch"
    
    The case when "some-arch" is not a valid Linux architecture results in an error.
    This makes sense if the TARGET_OS is Linux, but that is not always the case.
    kernel-arch is also inherited by toolchain-script, which may be used to build
    toolchains for architectures not supported by Linux.
    
    Rather than modifying toolchain-script to provide its own version of "map_arch"
    this patch bypasses the error if the TARGET_OS is not linux.
    
    (From OE-Core rev: 0b931e983b1f663d5d7dc65f1db7687334dd3ef2)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-arch.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/kernel-arch.bbclass b/meta/classes/kernel-arch.bbclass
index 04c49b9..d036fcf 100644
--- a/meta/classes/kernel-arch.bbclass
+++ b/meta/classes/kernel-arch.bbclass
@@ -32,6 +32,8 @@ def map_kernel_arch(a, d):
     elif re.match('microblazee[bl]', a):        return 'microblaze'
     elif a in valid_archs:                      return a
     else:
+        if not d.getVar("TARGET_OS").startswith("linux"):
+            return a
         bb.error("cannot map '%s' to a linux kernel architecture" % a)
 
 export ARCH = "${@map_kernel_arch(d.getVar('TARGET_ARCH'), d)}"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]