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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7e4bb696cf511fdf7b4d2fb17c87cece870da544..9fae1fe43f3f1da627ef55cbb652559b358817fc 100644 (file)
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -220,7 +220,7 @@ insert_feed_uris () {
 log_check() {
        for target in $*
        do
-               lf_path="${WORKDIR}/temp/log.do_$target.${PID}"
+               lf_path="`dirname ${BB_LOGFILE}`/log.do_$target.${PID}"
                
                echo "log_check: Using $lf_path as logfile"
                

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 0a8dc1bd7ed196e394bc6ddc5127bc72ec0d17a3..f58fd2be02791c1ff47507c5d7a739ea310d96b9 100644 (file)
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -167,10 +167,10 @@ package_install_internal_deb () {
                fi
        done
 
-       rm -f ${WORKDIR}/temp/log.do_${task}-attemptonly.${PID}
+       rm -f `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID}
        if [ ! -z "${package_attemptonly}" ]; then
                for i in ${package_attemptonly}; do
-                       apt-get install $i --force-yes --allow-unauthenticated >> ${WORKDIR}/temp/log.do_${task}-attemptonly.${PID} 2>&1 || true
+                       apt-get install $i --force-yes --allow-unauthenticated >> `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID} 2>&1 || true
                done
        fi
 

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index c86ea0314d3ea77fe43cd2e6a56fa19033e60b54..e682e6a611ff913d940640a130741867779a2bb6 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -157,7 +157,7 @@ package_install_internal_ipk() {
        fi
 
        if [ ! -z "${package_attemptonly}" ]; then
-               opkg-cl ${ipkg_args} install ${package_attemptonly} > "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" || true
+               opkg-cl ${ipkg_args} install ${package_attemptonly} > "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true
        fi
 
        package_tryout_install_multilib_ipk

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 5559a4671ffefca07fc836d56e96f16b724832db..78279f59b314c54f6b2c211c846024477fb93db2 100644 (file)
--- 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

diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 5aa8e92b87e9d0a4c087f913d444296090dd8c2c..1131d686b9ec35e2a73c9c870eac888b6b0a4c8b 100644 (file)
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -70,7 +70,7 @@ fakeroot do_populate_sdk() {
 populate_sdk_log_check() {
        for target in $*
        do
-               lf_path="${WORKDIR}/temp/log.do_$target.${PID}"
+               lf_path="`dirname ${BB_LOGFILE}`/log.do_$target.${PID}"
 
                echo "log_check: Using $lf_path as logfile"