summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 08:21:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-12 08:22:00 +0100
commit58d2ff3955f5ab8712516651ad6cc51d86bc1ba1 (patch)
tree027828af1b2ec21931f957e726c071ef7c003e1e
parent7e5d41ab223b73c1c7b2cf7e4dd13289a2dc2e8b (diff)
downloadpoky-58d2ff3955f5ab8712516651ad6cc51d86bc1ba1.tar.gz
poky-58d2ff3955f5ab8712516651ad6cc51d86bc1ba1.tar.bz2
poky-58d2ff3955f5ab8712516651ad6cc51d86bc1ba1.zip
package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path issues
(From OE-Core rev: f714f54df01e02a1115b42f3637f74a11eb51edb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 603333227f..fd00fb13e7 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