summaryrefslogtreecommitdiffstats
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-01-29 08:49:50 +0000
commitadd548491a46d7452f2d2f9b5924f672c8a18f1d (patch)
tree5046430570bed17e6d9973cccc69c6de70c5e444
parentea8ba1b6e63a0202ceaf7a6ce258f511b8d978f9 (diff)
downloadpoky-add548491a46d7452f2d2f9b5924f672c8a18f1d.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: 3e4ddeab65d4d2e4aaf03d442c2a1a8c7a2ce8a2) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 bcaf8a30a5..34ef88a1fb 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -651,9 +651,13 @@ python do_package_rpm () {
651 rpmbuild = d.getVar('RPMBUILD') 651 rpmbuild = d.getVar('RPMBUILD')
652 targetsys = d.getVar('TARGET_SYS') 652 targetsys = d.getVar('TARGET_SYS')
653 targetvendor = d.getVar('HOST_VENDOR') 653 targetvendor = d.getVar('HOST_VENDOR')
654
654 # Too many places in dnf stack assume that arch-independent packages are "noarch". 655 # Too many places in dnf stack assume that arch-independent packages are "noarch".
655 # Let's not fight against this. 656 # Let's not fight against this.
656 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch") 657 package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_")
658 if package_arch == "all":
659 package_arch = "noarch"
660
657 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") 661 sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
658 d.setVar('PACKAGE_ARCH_EXTEND', package_arch) 662 d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
659 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') 663 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')