]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm.bbclass: Don't use the system wide RPM macros.
authorRob Bradford <rob@chaos.oh>
Tue, 28 Oct 2008 18:48:22 +0000 (18:48 +0000)
committerRob Bradford <rob@chaos.oh>
Tue, 28 Oct 2008 18:52:19 +0000 (18:52 +0000)
This fixes the build on Fedora 10 where the RPM system macros obliterate the
value of BuildRoot that is set in the spec file.

meta/classes/package_rpm.bbclass

index 3defcdde70078e4544a6f7cf63e83e6be5980243..d291733dcf5a7568ed5e69872c2de20981dcdc3e 100644 (file)
@@ -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