summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-30 22:31:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:24 +0100
commitfbf50a71e8ba812ab1fecb9e1c9097b3531bf500 (patch)
tree09cac3a79d253a74385bb9b4356813cec8976da2 /meta/classes
parent2708ce6c824f755e1581365e42f60f7ae7fcf771 (diff)
downloadpoky-fbf50a71e8ba812ab1fecb9e1c9097b3531bf500.tar.gz
package_rpm: Ensure multilib code is only called in the multilib case
This fixes some error messages in the do_rootfs logs of non-multilib builds. (From OE-Core rev: 439867efcc9a7df6062fdb8dae85004b1e9ed08c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_rpm.bbclass33
1 files changed, 18 insertions, 15 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fa0d8c3457..7f425837be 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -354,6 +354,8 @@ package_install_internal_rpm () {
354 -D "__dbi_txn create nofsync private" \ 354 -D "__dbi_txn create nofsync private" \
355 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_solution.manifest 355 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_solution.manifest
356 356
357 touch ${target_rootfs}/install/install_multilib_solution.manifest
358
357 if [ ! -z "${multilib_to_install}" ]; then 359 if [ ! -z "${multilib_to_install}" ]; then
358 for pkg in ${multilib_to_install} ; do 360 for pkg in ${multilib_to_install} ; do
359 echo "Processing $pkg..." 361 echo "Processing $pkg..."
@@ -376,24 +378,25 @@ package_install_internal_rpm () {
376 fi 378 fi
377 echo $pkg_name >> ${target_rootfs}/install/install_multilib.manifest 379 echo $pkg_name >> ${target_rootfs}/install/install_multilib.manifest
378 done 380 done
379 fi
380 381
381 # multilib package installation 382 # multilib package installation
382 383
383 # Generate an install solution by doing a --justdb install, then recreate it with 384 # Generate an install solution by doing a --justdb install, then recreate it with
384 # an actual package install! 385 # an actual package install!
385 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \ 386 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
386 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \ 387 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
387 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}-ml_archs.macro`" \ 388 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}-ml_archs.macro`" \
388 -D "__dbi_txn create nofsync" \ 389 -D "__dbi_txn create nofsync" \
389 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ 390 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
390 ${target_rootfs}/install/install_multilib.manifest 391 ${target_rootfs}/install/install_multilib.manifest
392
393 # Now that we have a solution, pull out a list of what to install...
394 echo "Manifest: ${target_rootfs}/install/install_multilib.manifest"
395 ${RPM} -D "_dbpath ${target_rootfs}/install" -qa --yaml \
396 -D "__dbi_txn create nofsync private" \
397 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
391 398
392 # Now that we have a solution, pull out a list of what to install... 399 fi
393 echo "Manifest: ${target_rootfs}/install/install_multilib.manifest"
394 ${RPM} -D "_dbpath ${target_rootfs}/install" -qa --yaml \
395 -D "__dbi_txn create nofsync private" \
396 | grep -i 'Packageorigin' | cut -d : -f 2 > ${target_rootfs}/install/install_multilib_solution.manifest
397 400
398 cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest 401 cat ${target_rootfs}/install/install_solution.manifest > ${target_rootfs}/install/total_solution.manifest
399 cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest 402 cat ${target_rootfs}/install/install_multilib_solution.manifest >> ${target_rootfs}/install/total_solution.manifest