diff options
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index db448ab8d1..07eb974f73 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -684,7 +684,9 @@ python do_package_rpm () { | |||
684 | rpmbuild = d.getVar('RPMBUILD') | 684 | rpmbuild = d.getVar('RPMBUILD') |
685 | targetsys = d.getVar('TARGET_SYS') | 685 | targetsys = d.getVar('TARGET_SYS') |
686 | targetvendor = d.getVar('HOST_VENDOR') | 686 | targetvendor = d.getVar('HOST_VENDOR') |
687 | package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_") | 687 | # Too many places in dnf stack assume that arch-independent packages are "noarch". |
688 | # Let's not fight against this. | ||
689 | package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch") | ||
688 | sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") | 690 | sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") |
689 | if package_arch not in "all any noarch".split() and not package_arch.endswith(sdkpkgsuffix): | 691 | if package_arch not in "all any noarch".split() and not package_arch.endswith(sdkpkgsuffix): |
690 | ml_prefix = (d.getVar('MLPREFIX') or "").replace("-", "_") | 692 | ml_prefix = (d.getVar('MLPREFIX') or "").replace("-", "_") |