]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 12 Apr 2012 07:21:38 +0000 (08:21 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 12 Apr 2012 07:21:38 +0000 (08:21 +0100)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/package_rpm.bbclass

index 603333227fc142fac5b2d909fed7dc7d14a3ec1e..fd00fb13e7ab234ef35be4acc72a8dc69490b803 100644 (file)
@@ -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