diff options
| author | Rob Bradford <rob@chaos.oh> | 2008-10-28 18:48:22 +0000 |
|---|---|---|
| committer | Rob Bradford <rob@chaos.oh> | 2008-10-28 18:52:19 +0000 |
| commit | ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9 (patch) | |
| tree | 8e8619067181d1d09347573cd3bf32e1eddb01e8 /meta | |
| parent | 1045eaa369cc63d6db4ab8ba72055b64c85c0b64 (diff) | |
| download | poky-ea868f9c9c2a9a5fe95a26c2f38b554776b1dce9.tar.gz | |
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.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
| 147 | rpm_prep() { | 147 | rpm_prep() { |
| 148 | if [ ! -e ${WORKDIR}/rpmrc ]; then | 148 | if [ ! -e ${WORKDIR}/rpmrc ]; then |
| 149 | mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD} | 149 | mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD} |
| 150 | echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc | 150 | echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc |
| 151 | echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros | 151 | echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros |
| 152 | echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros | 152 | echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros |
| 153 | fi | 153 | fi |