summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass4
-rw-r--r--meta/classes/sstate.bbclass2
2 files changed, 4 insertions, 2 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("-", "_")
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e415f68870..a780926797 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -25,7 +25,7 @@ PV[vardepvalue] = "${PV}"
25SSTATE_EXTRAPATH[vardepvalue] = "" 25SSTATE_EXTRAPATH[vardepvalue] = ""
26 26
27# For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) 27# For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical)
28SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/" 28SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/noarch/"
29# Avoid docbook/sgml catalog warnings for now 29# Avoid docbook/sgml catalog warnings for now
30SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" 30SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"
31# Archive the sources for many architectures in one deploy folder 31# Archive the sources for many architectures in one deploy folder