Fix manual log file paths

When a recent change, the path to log files may be contained within an
arbitrary directory.  To generate the manual log files in the correct path
we should be using the ${BB_LOGFILE}'s path instead of always assuming the
logs go into ${WORKDIR}/temp.

(From OE-Core rev: 779db325d407f0bade84572ef99fdad4d0c88011)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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 () {
                                 echo "Note: Unable to find package $pkg ($ml_pkg) -- PACKAGE_INSTALL_ATTEMPTONLY"
                                 continue
                         fi
-                        echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}"
+                        echo "Attempting $pkg_name..." >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}"
                         ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
                                 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
                                 --root "${target_rootfs}/install" \
                                 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
                                 -D "__dbi_txn create nofsync private" \
                                 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
-                        $pkg_name >> "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" || true
+                        $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true
                 done
         fi
 
@@ -390,17 +390,17 @@ package_install_internal_rpm () {
 
                         if [ $found -eq 0 ]; then
                                 echo "Note: Unable to find package $pkg -- suggests"
-                                echo "Unable to find package $pkg." >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}"
+                                echo "Unable to find package $pkg." >> "`dirname ${BB_LOGFILE}`/log.do_${task}_recommend.${PID}"
                                 continue
                         fi
-                        echo "Attempting $pkg_name..." >> "${WORKDIR}/temp/log.do_{task}_recommend.${PID}"
+                        echo "Attempting $pkg_name..." >> "`dirname ${BB_LOGFILE}`/log.do_{task}_recommend.${PID}"
                         ${RPM} --predefine "_rpmds_sysinfo_path ${target_rootfs}/etc/rpm/sysinfo" \
                                 --predefine "_rpmrc_platform_path ${target_rootfs}/etc/rpm/platform" \
                                 --root "${target_rootfs}/install" \
                                 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
                                 -D "__dbi_txn create nofsync private" \
                                 -U --justdb --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
-                                $pkg_name >> "${WORKDIR}/temp/log.do_${task}_recommend.${PID}" 2>&1 || true
+                                $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_recommend.${PID}" 2>&1 || true
                 done
                 cat ${target_rootfs}/install/recommend.list ${target_rootfs}/install/recommend.new | sort -u > ${target_rootfs}/install/recommend.new.list
                 mv -f ${target_rootfs}/install/recommend.new.list ${target_rootfs}/install/recommend.list