[oe-commits] Richard Purdie : package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path issues

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: f714f54df01e02a1115b42f3637f74a11eb51edb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f714f54df01e02a1115b42f3637f74a11eb51edb

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Apr 12 08:21:38 2012 +0100

package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path issues

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_rpm.bbclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 6033332..fd00fb1 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -486,8 +486,7 @@ EOF
 
 		${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
 			--predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
-			-D "_dbpath ${target_rootfs}/initial" -D "`cat ${confbase}-base_archs.macro`" \
-			-D "`cat ${confbase}-ml_archs.macro`" \
+			-D "_dbpath ${target_rootfs}/initial" -D "`cat ${confbase}.macro`" \
 			-D "__dbi_txn create nofsync" \
 			-U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
 			${target_rootfs}/install/initial_install.manifest