diff options
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9fa0155c8a..14de3e1994 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -39,7 +39,7 @@ python () { # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... - if bb.data.getVar('__RUNQUEUE_DO_NOT_USE_EXTERNALLY', d, True) is not None: + if bb.data.getVar('BB_WORKERCONTEXT', d, True) is not None: runtime_mapping_rename("PACKAGE_INSTALL", d) runtime_mapping_rename("PACKAGE_INSTALL_ATTEMPTONLY", d) } @@ -155,7 +155,6 @@ insert_feed_uris () { } log_check() { - set +x for target in $* do lf_path="${WORKDIR}/temp/log.do_$target.${PID}" @@ -164,14 +163,12 @@ log_check() { if test -e "$lf_path" then - rootfs_${IMAGE_PKGTYPE}_log_check $target $lf_path + ${IMAGE_PKGTYPE}_log_check $target $lf_path else echo "Cannot find logfile [$lf_path]" fi echo "Logfile is clean" done - - set -x } # set '*' as the rootpassword so the images |