summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-01-24 18:39:11 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-19 23:53:34 +0000
commit1c55a7e4b5022b1f7289f86ca75e0eeeb0bc2403 (patch)
treef1f7f5c2ffe5bbd36d8a875223e6be5edff15062 /meta
parent932ecd6def4b84ac23bebe6c08c214d112028a1f (diff)
downloadpoky-1c55a7e4b5022b1f7289f86ca75e0eeeb0bc2403.tar.gz
package_rpm.bbclass: Fix matching of architecture independent packages
OE-Core changes the architecture independent RPM packages to use "noarch" instead of "all". This change has been included in the commit below: ,---- | commit 341810aff923ace6b1cc1e15e19383c4f8773b51 | Author: Alexander Kanavin <alexander.kanavin@linux.intel.com> | Date: Mon Jan 9 16:37:28 2017 +0200 | | 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> `---- This is causing problems with machines that has "all" inside the machine name. Reported-by: Alexandru Palalau <ioan-alexandru.palalau@nxp.com> (From OE-Core rev: e92fdac3055b612ae1a1c1b033b5451a1750fe34) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 3e4ddeab65d4d2e4aaf03d442c2a1a8c7a2ce8a2) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 1deaf832da..a428d30641 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -646,9 +646,13 @@ python do_package_rpm () {
646 rpmbuild = d.getVar('RPMBUILD') 646 rpmbuild = d.getVar('RPMBUILD')
647 targetsys = d.getVar('TARGET_SYS') 647 targetsys = d.getVar('TARGET_SYS')
648 targetvendor = d.getVar('HOST_VENDOR') 648 targetvendor = d.getVar('HOST_VENDOR')
649
649 # Too many places in dnf stack assume that arch-independent packages are "noarch". 650 # Too many places in dnf stack assume that arch-independent packages are "noarch".
650 # Let's not fight against this. 651 # Let's not fight against this.
651 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch") 652 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_")
653 if package_arch == "all":
654 package_arch = "noarch"
655
652 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") 656 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
653 d.setVar('PACKAGE_ARCH_EXTEND', package_arch) 657 d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
654 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') 658 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')