summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Bradford <rob@chaos.oh>2008-10-28 18:48:22 +0000
committerRob Bradford <rob@chaos.oh>2008-10-28 18:52:19 +0000
commitea868f9c9c2a9a5fe95a26c2f38b554776b1dce9 (patch)
tree8e8619067181d1d09347573cd3bf32e1eddb01e8
parent1045eaa369cc63d6db4ab8ba72055b64c85c0b64 (diff)
downloadopenembedded-core-ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9.tar.gz
openembedded-core-ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9.tar.bz2
openembedded-core-ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9.tar.xz
openembedded-core-ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9.zip
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.
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 3defcdde7..d291733dc 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