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: 445ac7b3198885c67622b4303b010a85c3e3e61e) 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>
This commit is contained in:
parent
e30f8120ac
commit
e763abcd01
|
@ -646,9 +646,13 @@ python do_package_rpm () {
|
||||||
rpmbuild = d.getVar('RPMBUILD')
|
rpmbuild = d.getVar('RPMBUILD')
|
||||||
targetsys = d.getVar('TARGET_SYS')
|
targetsys = d.getVar('TARGET_SYS')
|
||||||
targetvendor = d.getVar('HOST_VENDOR')
|
targetvendor = d.getVar('HOST_VENDOR')
|
||||||
|
|
||||||
# Too many places in dnf stack assume that arch-independent packages are "noarch".
|
# Too many places in dnf stack assume that arch-independent packages are "noarch".
|
||||||
# Let's not fight against this.
|
# Let's not fight against this.
|
||||||
package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_").replace("all", "noarch")
|
package_arch = (d.getVar('PACKAGE_ARCH') or "").replace("-", "_")
|
||||||
|
if package_arch == "all":
|
||||||
|
package_arch = "noarch"
|
||||||
|
|
||||||
sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
|
sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
|
||||||
d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
|
d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
|
||||||
pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
|
pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
|
||||||
|
|
Loading…
Reference in New Issue