]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm.bbclass: do not set the OS dynamically when building rpms
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Mon, 27 Feb 2017 09:29:38 +0000 (11:29 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 13 Mar 2017 09:43:21 +0000 (09:43 +0000)
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>
meta/classes/package_rpm.bbclass

index 2cdaae0ff25adcc4123fcd39a98fddefc54e5020..4f4f8e4e11cf2b8b48b339def6163695e71bdcf8 100644 (file)
@@ -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)