summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-12-01 12:51:06 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:24:52 +0000
commitf946417623df096b5d0621326de20b2b82f96cac (patch)
treee184f3c7ed69ae0775fb52d3f83374497b259c45
parent06afdb89288673f5a3f4179f8af3b4b1fb1a9b8b (diff)
downloadpoky-f946417623df096b5d0621326de20b2b82f96cac.tar.gz
package_rpm.bbclass: Add additional logging
(From OE-Core rev: 2a21e63869ec9541dd338df1d86ef2ca01762bfe) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index fdca2c320d..b80b93912c 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -261,6 +261,7 @@ package_install_internal_rpm () {
261 channel_priority=5 261 channel_priority=5
262 if [ "${INSTALL_COMPLEMENTARY_RPM}" != "1" ] ; then 262 if [ "${INSTALL_COMPLEMENTARY_RPM}" != "1" ] ; then
263 # Setup base system configuration 263 # Setup base system configuration
264 echo "Note: configuring RPM platform settings"
264 mkdir -p ${target_rootfs}/etc/rpm/ 265 mkdir -p ${target_rootfs}/etc/rpm/
265 if [ -n "${sdk_mode}" ]; then 266 if [ -n "${sdk_mode}" ]; then
266 platform_vendor="${SDK_VENDOR}" 267 platform_vendor="${SDK_VENDOR}"
@@ -289,6 +290,7 @@ package_install_internal_rpm () {
289 fi 290 fi
290 291
291 # Tell RPM that the "/" directory exist and is available 292 # Tell RPM that the "/" directory exist and is available
293 echo "Note: configuring RPM system provides"
292 mkdir -p ${target_rootfs}/etc/rpm/sysinfo 294 mkdir -p ${target_rootfs}/etc/rpm/sysinfo
293 echo "/" >${target_rootfs}/etc/rpm/sysinfo/Dirnames 295 echo "/" >${target_rootfs}/etc/rpm/sysinfo/Dirnames
294 296
@@ -300,6 +302,7 @@ package_install_internal_rpm () {
300 fi 302 fi
301 303
302 # Configure RPM... we enforce these settings! 304 # Configure RPM... we enforce these settings!
305 echo "Note: configuring RPM DB settings"
303 mkdir -p ${target_rootfs}${rpmlibdir} 306 mkdir -p ${target_rootfs}${rpmlibdir}
304 mkdir -p ${target_rootfs}${rpmlibdir}/log 307 mkdir -p ${target_rootfs}${rpmlibdir}/log
305 # After change the __db.* cache size, log file will not be generated automatically, 308 # After change the __db.* cache size, log file will not be generated automatically,
@@ -337,6 +340,7 @@ EOF
337 rpm --root $target_rootfs --dbpath /var/lib/rpm -qa > /dev/null 340 rpm --root $target_rootfs --dbpath /var/lib/rpm -qa > /dev/null
338 341
339 # Configure smart 342 # Configure smart
343 echo "Note: configuring Smart settings"
340 rm -rf ${target_rootfs}/var/lib/smart 344 rm -rf ${target_rootfs}/var/lib/smart
341 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-root=${target_rootfs} 345 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-root=${target_rootfs}
342 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-dbpath=${rpmlibdir} 346 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-dbpath=${rpmlibdir}
@@ -349,6 +353,7 @@ EOF
349 platform_extra_fixed=`echo "$platform_extra" | tr - _` 353 platform_extra_fixed=`echo "$platform_extra" | tr - _`
350 for arch in $platform_extra_fixed ; do 354 for arch in $platform_extra_fixed ; do
351 if [ -d ${DEPLOY_DIR_RPM}/$arch -a ! -e ${target_rootfs}/install/channel.$arch.stamp ] ; then 355 if [ -d ${DEPLOY_DIR_RPM}/$arch -a ! -e ${target_rootfs}/install/channel.$arch.stamp ] ; then
356 echo "Note: adding Smart channel $arch ($channel_priority)"
352 smart --data-dir=${target_rootfs}/var/lib/smart channel --add $arch type=rpm-md type=rpm-md baseurl=${DEPLOY_DIR_RPM}/$arch -y 357 smart --data-dir=${target_rootfs}/var/lib/smart channel --add $arch type=rpm-md type=rpm-md baseurl=${DEPLOY_DIR_RPM}/$arch -y
353 smart --data-dir=${target_rootfs}/var/lib/smart channel --set $arch priority=$channel_priority 358 smart --data-dir=${target_rootfs}/var/lib/smart channel --set $arch priority=$channel_priority
354 touch ${target_rootfs}/install/channel.$arch.stamp 359 touch ${target_rootfs}/install/channel.$arch.stamp
@@ -386,15 +391,19 @@ if [ \$? -ne 0 ]; then
386fi 391fi
387EOF 392EOF
388 393
394 echo "Note: configuring RPM cross-install scriptlet_wrapper"
389 chmod 0755 ${WORKDIR}/scriptlet_wrapper 395 chmod 0755 ${WORKDIR}/scriptlet_wrapper
390 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._cross_scriptlet_wrapper=${WORKDIR}/scriptlet_wrapper 396 smart --data-dir=${target_rootfs}/var/lib/smart config --set rpm-extra-macros._cross_scriptlet_wrapper=${WORKDIR}/scriptlet_wrapper
391 397
392 # Determine what to install 398 # Determine what to install
393 translate_oe_to_smart ${sdk_mode} ${package_to_install} ${package_linguas} 399 translate_oe_to_smart ${sdk_mode} ${package_to_install} ${package_linguas}
394 400
401 echo "Note: to be installed: ${pkgs_to_install}"
395 [ -n "$pkgs_to_install" ] && smart --data-dir=${target_rootfs}/var/lib/smart install -y ${pkgs_to_install} 402 [ -n "$pkgs_to_install" ] && smart --data-dir=${target_rootfs}/var/lib/smart install -y ${pkgs_to_install}
396 403
397 if [ -n "${package_attemptonly}" ]; then 404 if [ -n "${package_attemptonly}" ]; then
405 echo "Note: installing attempt only packages..."
406 echo "Note: see `dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}"
398 translate_oe_to_smart ${sdk_mode} --attemptonly $package_attemptonly 407 translate_oe_to_smart ${sdk_mode} --attemptonly $package_attemptonly
399 echo "Attempting $pkgs_to_install" 408 echo "Attempting $pkgs_to_install"
400 smart --data-dir=${target_rootfs}/var/lib/smart install -y $pkgs_to_install >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" 2>&1 || true 409 smart --data-dir=${target_rootfs}/var/lib/smart install -y $pkgs_to_install >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" 2>&1 || true