summaryrefslogtreecommitdiffstats
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-14 14:42:17 +0000
commitb45765d7aca4d4d4eb1528dd9270c6e04eadc553 (patch)
tree726ea23b86cb3ab22bc5e8e9ac7202cf5af1a870
parent1cf9dd6492e2e234a3b41419d84e94ca1520954c (diff)
downloadpoky-b45765d7aca4d4d4eb1528dd9270c6e04eadc553.tar.gz
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. (From OE-Core rev: 580ba965f5f38f6718a83f690bbe23a63fbcd3dd) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 2cdaae0ff2..4f4f8e4e11 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -692,7 +692,7 @@ python do_package_rpm () {
692 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') 692 pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
693 d.setVar('RPM_PKGWRITEDIR', pkgwritedir) 693 d.setVar('RPM_PKGWRITEDIR', pkgwritedir)
694 bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR')) 694 bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR'))
695 pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') 695 pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-linux')
696 bb.utils.mkdirhier(pkgwritedir) 696 bb.utils.mkdirhier(pkgwritedir)
697 os.chmod(pkgwritedir, 0o755) 697 os.chmod(pkgwritedir, 0o755)
698 698