Patchwork [CONSOLIDATED,PULL,10/10] Magic file path should be given for rpmbuild

login
register
mail settings
Submitter Saul Wold
Date Aug. 11, 2011, 4:29 p.m.
Message ID <0377a5128953172ec0893d7cd4c1c0cf7fc9b64c.1313079549.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/9633/
State New, archived
Headers show

Comments

Saul Wold - Aug. 11, 2011, 4:29 p.m.
From: jani.uusi-rantala@nokia.com <jani.uusi-rantala@nokia.com>

From d54b975506c392cfb59dbb3caf313ac061b6fa01 Mon Sep 17 00:00:00 2001
From: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
Date: Thu, 11 Aug 2011 18:37:56 +0300
Subject: [PATCH] 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>
---
 meta/classes/package_rpm.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index f123229..59e8d48 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -822,6 +822,7 @@  python do_package_rpm () {
 	targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
 	pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
 	pkgarch = bb.data.expand('${PACKAGE_ARCH}', d)
+	magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
 	bb.mkdirhier(pkgwritedir)
 	os.chmod(pkgwritedir, 0755)
 
@@ -834,6 +835,7 @@  python do_package_rpm () {
 	cmd = cmd + " --define '__find_provides " + outprovides + "'"
 	cmd = cmd + " --define '_unpackaged_files_terminate_build 0'"
 	cmd = cmd + " --define 'debug_package %{nil}'"
+	cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'"
 	cmd = cmd + " -bb " + outspecfile
 
 	# Build the rpm package!