[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5885/8267] rpm: allow arch-dependent binaries in noarch packages

[Emmanuele Bassi <ebassi src gnome org>]

commit 9cf8705ce2965a97a18c3c23ed66f8536c7c1612
Author: Ng Wei Tee <wei tee ng intel com>
Date:   Thu May 4 19:04:57 2017 -0700

    rpm: allow arch-dependent binaries in noarch packages
    
    This is needed for packages like linux-firmware which have a
    legitimate reason for it. Oe-core has a separate package_qa
    test for this situation, so any accidental inclusions of such
    binaries will still be caught.
    
    [YOCTO #11329]
    
    (From OE-Core rev: 6aaff392d703183d19192e2d171e10a92f259c65)
    
    Signed-off-by: Ng Wei Tee <wei tee ng intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package_rpm.bbclass |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 084546f..a844c4d 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -643,6 +643,7 @@ python do_package_rpm () {
     cmd = cmd + " --define '_builddir " + d.getVar('S') + "'"
     cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
     cmd = cmd + " --define '_use_internal_dependency_generator 0'"
+    cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
     if perfiledeps:
         cmd = cmd + " --define '__find_requires " + outdepends + "'"
         cmd = cmd + " --define '__find_provides " + outprovides + "'"