summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 5559a4671f..78279f59b3 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -342,14 +342,14 @@ package_install_internal_rpm () {
342 echo "Note: Unable to find package $pkg ($ml_pkg) -- PACKAGE_INSTALL_ATTEMPTONLY" 342 echo "Note: Unable to find package $pkg ($ml_pkg) -- PACKAGE_INSTALL_ATTEMPTONLY"
343 continue 343 continue
344 fi 344 fi
345 echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" 345 echo "Attempting $pkg_name..." >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}"
346 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \ 346 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
347 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \ 347 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
348 --root "${target_rootfs}/install" \ 348 --root "${target_rootfs}/install" \
349 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \ 349 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
350 -D "__dbi_txn create nofsync private" \ 350 -D "__dbi_txn create nofsync private" \
351 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ 351 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
352 $pkg_name >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" || true 352 $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true
353 done 353 done
354 fi 354 fi
355 355
@@ -390,17 +390,17 @@ package_install_internal_rpm () {
390 390
391 if [ $found -eq 0 ]; then 391 if [ $found -eq 0 ]; then
392 echo "Note: Unable to find package $pkg -- suggests" 392 echo "Note: Unable to find package $pkg -- suggests"
393 echo "Unable to find package $pkg." >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}" 393 echo "Unable to find package $pkg." >> "`dirname ${BB_LOGFILE}`/log.do_${task}_recommend.${PID}"
394 continue 394 continue
395 fi 395 fi
396 echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_{task}_recommend.${PID}" 396 echo "Attempting $pkg_name..." >> "`dirname ${BB_LOGFILE}`/log.do_{task}_recommend.${PID}"
397 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \ 397 ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
398 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \ 398 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
399 --root "${target_rootfs}/install" \ 399 --root "${target_rootfs}/install" \
400 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \ 400 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
401 -D "__dbi_txn create nofsync private" \ 401 -D "__dbi_txn create nofsync private" \
402 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ 402 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
403 $pkg_name >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}" 2>&1 || true 403 $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_recommend.${PID}" 2>&1 || true
404 done 404 done
405 cat ${target_rootfs}/install/recommend.list ${target_rootfs}/install/recommend.new | sort -u > ${target_rootfs}/install/recommend.new.list 405 cat ${target_rootfs}/install/recommend.list ${target_rootfs}/install/recommend.new | sort -u > ${target_rootfs}/install/recommend.new.list
406 mv -f ${target_rootfs}/install/recommend.new.list ${target_rootfs}/install/recommend.list 406 mv -f ${target_rootfs}/install/recommend.new.list ${target_rootfs}/install/recommend.list