From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Date: Mon, 27 Feb 2017 09:29:38 +0000 (+0200)
Subject: package_rpm.bbclass: do not set the OS dynamically when building rpms
X-Git-Tag: uninative-1.6~210
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=580ba965f5f38f6718a83f690bbe23a63fbcd3dd;p=openembedded-core.git

package_rpm.bbclass: do not set the OS dynamically when building rpms

Packages need to contain just one value for the os field, otherwise
rpm will refuse to install them if they don't match what is in
/etc/rpm/platform.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2cdaae0ff2..4f4f8e4e11 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -692,7 +692,7 @@ python do_package_rpm () {
     pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
     d.setVar('RPM_PKGWRITEDIR', pkgwritedir)
     bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR'))
-    pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}')
+    pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-linux')
     bb.utils.mkdirhier(pkgwritedir)
     os.chmod(pkgwritedir, 0o755)