[gnome-continuous-yocto/gnomeostree-3.28-rocko: 126/218] package_rpm.bbclass: Fix matching of architecture independent packages

[Emmanuele Bassi <ebassi src gnome org>]

commit 1c55a7e4b5022b1f7289f86ca75e0eeeb0bc2403
Author: Otavio Salvador <otavio ossystems com br>
Date:   Wed Jan 24 18:39:11 2018 -0200

    package_rpm.bbclass: Fix matching of architecture independent packages
    
    OE-Core changes the architecture independent RPM packages to use
    "noarch" instead of "all". This change has been included in the commit
    below:
    
    ,----
    | commit 341810aff923ace6b1cc1e15e19383c4f8773b51
    | Author: Alexander Kanavin <alexander kanavin linux intel com>
    | Date:   Mon Jan 9 16:37:28 2017 +0200
    |
    |     package_rpm.bbclass: make architecture-independent .rpm packages
    |     "noarch" instead of "all"
    |
    |     Too many places in dnf/rpm4 stack make that assumption; let's not
    |     fight against it.
    |
    |     Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    `----
    
    This is causing problems with machines that has "all" inside the
    machine name.
    
    Reported-by: Alexandru Palalau <ioan-alexandru palalau nxp com>
    (From OE-Core rev: e92fdac3055b612ae1a1c1b033b5451a1750fe34)
    
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit 3e4ddeab65d4d2e4aaf03d442c2a1a8c7a2ce8a2)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/package_rpm.bbclass |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1deaf83..a428d30 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -646,9 +646,13 @@ python do_package_rpm () {
     rpmbuild = d.getVar('RPMBUILD')
     targetsys = d.getVar('TARGET_SYS')
     targetvendor = d.getVar('HOST_VENDOR')
+
     # Too many places in dnf stack assume that arch-independent packages are "noarch".
     # Let's not fight against this.
-    package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch")
+    package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_")
+    if package_arch == "all":
+        package_arch = "noarch"
+
     sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
     d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
     pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')