aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-02-27 11:29:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-13 09:43:21 +0000
commit580ba965f5f38f6718a83f690bbe23a63fbcd3dd (patch)
tree23d7f8e811924aa6b1747bef80835f51b95c9956
parentb18c32ab6bc9c4f1953e9f79aa39bc92d1c4e30d (diff)
downloadopenembedded-core-contrib-580ba965f5f38f6718a83f690bbe23a63fbcd3dd.tar.gz
openembedded-core-contrib-580ba965f5f38f6718a83f690bbe23a63fbcd3dd.tar.bz2
openembedded-core-contrib-580ba965f5f38f6718a83f690bbe23a63fbcd3dd.zip
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>
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2cdaae0ff25..4f4f8e4e11c 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)