diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-01-09 16:37:28 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
| commit | 341810aff923ace6b1cc1e15e19383c4f8773b51 (patch) | |
| tree | fc30a3d329f4341547bc11a59a3cb0bbeb8539ee /meta/classes | |
| parent | 2694de76542840f79e3953c546d07b8ae479b8a1 (diff) | |
| download | openembedded-core-341810aff923ace6b1cc1e15e19383c4f8773b51.tar.gz openembedded-core-341810aff923ace6b1cc1e15e19383c4f8773b51.tar.bz2 openembedded-core-341810aff923ace6b1cc1e15e19383c4f8773b51.zip | |
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/sstate.bbclass | 2 |
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 () { rpmbuild = d.getVar('RPMBUILD') targetsys = d.getVar('TARGET_SYS') targetvendor = d.getVar('HOST_VENDOR') - package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_") + # 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") sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") if package_arch not in "all any noarch".split() and not package_arch.endswith(sdkpkgsuffix): 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}" SSTATE_EXTRAPATH[vardepvalue] = "" # For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) -SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/" +SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/noarch/" # Avoid docbook/sgml catalog warnings for now SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" # Archive the sources for many architectures in one deploy folder |