summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-18 16:42:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-03 14:54:57 +0100
commit9870fbc9f80f6c752e0d5cb73a118603b078f44f (patch)
treefac0d67506861f4f80c26c7efd88c1845467cfc0
parentbd2d6016c067b9e406da78c45eaad463117ffb76 (diff)
downloadpoky-9870fbc9f80f6c752e0d5cb73a118603b078f44f.tar.gz
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>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/package_deb.bbclass4
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass10
-rw-r--r--meta/classes/populate_sdk.bbclass2
5 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7e4bb696cf..9fae1fe43f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -220,7 +220,7 @@ insert_feed_uris () {
220log_check() { 220log_check() {
221 for target in $* 221 for target in $*
222 do 222 do
223 lf_path="${WORKDIR}/temp/log.do_$target.${PID}" 223 lf_path="`dirname ${BB_LOGFILE}`/log.do_$target.${PID}"
224 224
225 echo "log_check: Using $lf_path as logfile" 225 echo "log_check: Using $lf_path as logfile"
226 226
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 0a8dc1bd7e..f58fd2be02 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -167,10 +167,10 @@ package_install_internal_deb () {
167 fi 167 fi
168 done 168 done
169 169
170 rm -f ${WORKDIR}/temp/log.do_${task}-attemptonly.${PID} 170 rm -f `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID}
171 if [ ! -z "${package_attemptonly}" ]; then 171 if [ ! -z "${package_attemptonly}" ]; then
172 for i in ${package_attemptonly}; do 172 for i in ${package_attemptonly}; do
173 apt-get install $i --force-yes --allow-unauthenticated >> ${WORKDIR}/temp/log.do_${task}-attemptonly.${PID} 2>&1 || true 173 apt-get install $i --force-yes --allow-unauthenticated >> `dirname ${BB_LOGFILE}`/log.do_${task}-attemptonly.${PID} 2>&1 || true
174 done 174 done
175 fi 175 fi
176 176
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index c86ea0314d..e682e6a611 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -157,7 +157,7 @@ package_install_internal_ipk() {
157 fi 157 fi
158 158
159 if [ ! -z "${package_attemptonly}" ]; then 159 if [ ! -z "${package_attemptonly}" ]; then
160 opkg-cl ${ipkg_args} install ${package_attemptonly} > "${WORKDIR}/temp/log.do_${task}_attemptonly.${PID}" || true 160 opkg-cl ${ipkg_args} install ${package_attemptonly} > "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true
161 fi 161 fi
162 162
163 package_tryout_install_multilib_ipk 163 package_tryout_install_multilib_ipk
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
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 5aa8e92b87..1131d686b9 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -70,7 +70,7 @@ fakeroot do_populate_sdk() {
70populate_sdk_log_check() { 70populate_sdk_log_check() {
71 for target in $* 71 for target in $*
72 do 72 do
73 lf_path="${WORKDIR}/temp/log.do_$target.${PID}" 73 lf_path="`dirname ${BB_LOGFILE}`/log.do_$target.${PID}"
74 74
75 echo "log_check: Using $lf_path as logfile" 75 echo "log_check: Using $lf_path as logfile"
76 76