From: Rob Bradford <rob@chaos.oh>
Date: Tue, 28 Oct 2008 18:48:22 +0000 (+0000)
Subject: package_rpm.bbclass: Don't use the system wide RPM macros.
X-Git-Tag: 2011-1~7929
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9;p=openembedded-core.git

package_rpm.bbclass: Don't use the system wide RPM macros.

This fixes the build on Fedora 10 where the RPM system macros obliterate the
value of BuildRoot that is set in the spec file.
---

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3defcdde70..d291733dcf 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -147,7 +147,7 @@ python write_specfile() {
 rpm_prep() {
 	if [ ! -e ${WORKDIR}/rpmrc ]; then
 		mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
-		echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+		echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
 		echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
 		echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
 	fi