diff options
author | jani.uusi-rantala@nokia.com <jani.uusi-rantala@nokia.com> | 2011-08-11 21:22:52 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2011-10-14 09:38:40 -0700 |
commit | 7779a1fedcaa9e0797893d00cff036ecd8823be0 (patch) | |
tree | 7f7777b3782caf53cc6247603bd2b516f5654e73 | |
parent | 1c5171b2518ea3e037a53caaf50c4bf46bfc13ee (diff) | |
download | poky-7779a1fedcaa9e0797893d00cff036ecd8823be0.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.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 70170d19ef..4f300f8d24 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -763,6 +763,7 @@ python do_package_rpm () { | |||
763 | targetsys = bb.data.getVar('TARGET_SYS', d, True) | 763 | targetsys = bb.data.getVar('TARGET_SYS', d, True) |
764 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) | 764 | pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) |
765 | pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) | 765 | pkgarch = bb.data.expand('${PACKAGE_ARCH}', d) |
766 | magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d) | ||
766 | bb.mkdirhier(pkgwritedir) | 767 | bb.mkdirhier(pkgwritedir) |
767 | os.chmod(pkgwritedir, 0755) | 768 | os.chmod(pkgwritedir, 0755) |
768 | 769 | ||
@@ -775,6 +776,7 @@ python do_package_rpm () { | |||
775 | cmd = cmd + " --define '__find_provides " + outprovides + "'" | 776 | cmd = cmd + " --define '__find_provides " + outprovides + "'" |
776 | cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" | 777 | cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" |
777 | cmd = cmd + " --define 'debug_package %{nil}'" | 778 | cmd = cmd + " --define 'debug_package %{nil}'" |
779 | cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'" | ||
778 | cmd = cmd + " -bb " + outspecfile | 780 | cmd = cmd + " -bb " + outspecfile |
779 | 781 | ||
780 | # Build the rpm package! | 782 | # Build the rpm package! |