summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-01-09 16:37:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:17 +0000
commitcf7e0baffae0bbeb021060b0d10fb263a4651f53 (patch)
treeaeb5423e31756148c28fb96bfe1cf2b308170c2f /meta
parentf033bba14a221c1e815dffa27c6bda1193a0f119 (diff)
downloadpoky-cf7e0baffae0bbeb021060b0d10fb263a4651f53.tar.gz
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. (From OE-Core rev: 341810aff923ace6b1cc1e15e19383c4f8773b51) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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