summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_rpm.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index bcaf8a30a5..34ef88a1fb 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -651,9 +651,13 @@ python do_package_rpm () {
651 rpmbuild = d.getVar('RPMBUILD') 651 rpmbuild = d.getVar('RPMBUILD')
652 targetsys = d.getVar('TARGET_SYS') 652 targetsys = d.getVar('TARGET_SYS')
653 targetvendor = d.getVar('HOST_VENDOR') 653 targetvendor = d.getVar('HOST_VENDOR')
654
654 # Too many places in dnf stack assume that arch-independent packages are "noarch". 655 # Too many places in dnf stack assume that arch-independent packages are "noarch".
655 # Let's not fight against this. 656 # Let's not fight against this.
656 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch") 657 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_")
658 if package_arch == "all":
659 package_arch = "noarch"
660
657 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") 661 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
658 d.setVar('PACKAGE_ARCH_EXTEND', package_arch) 662 d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
659 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') 663 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')