summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjani.uusi-rantala@nokia.com <jani.uusi-rantala@nokia.com>2011-08-11 21:22:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-11 21:22:52 +0100
commite79534d2afbc7e2acd631e0bcfdae13a768427d6 (patch)
treea4bc7f7688411279d1d53e20e2fef6dee626589b
parent0350be945877b61eb8125663887fd7ed1c3923ab (diff)
downloadpoky-e79534d2afbc7e2acd631e0bcfdae13a768427d6.tar.gz
Magic file path should be given for rpmbuild
Magic file path should be given for rpmbuild in _rpmfc_magic_path define so that build system default file is not used by accident. Not doing this caused many packages to fail building in several systems. Fixes [YOCTO #1358] Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index f1232292f6..59e8d48b20 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -822,6 +822,7 @@ python do_package_rpm () {
822 targetvendor = bb.data.getVar('TARGET_VENDOR', d, True) 822 targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
823 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) 823 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
824 pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) 824 pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
825 magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
825 bb.mkdirhier(pkgwritedir) 826 bb.mkdirhier(pkgwritedir)
826 os.chmod(pkgwritedir, 0755) 827 os.chmod(pkgwritedir, 0755)
827 828
@@ -834,6 +835,7 @@ python do_package_rpm () {
834 cmd = cmd + " --define '__find_provides " + outprovides + "'" 835 cmd = cmd + " --define '__find_provides " + outprovides + "'"
835 cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" 836 cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
836 cmd = cmd + " --define 'debug_package %{nil}'" 837 cmd = cmd + " --define 'debug_package %{nil}'"
838 cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
837 cmd = cmd + " -bb " + outspecfile 839 cmd = cmd + " -bb " + outspecfile
838 840
839 # Build the rpm package! 841 # Build the rpm package!