summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-15 23:22:16 +0000
committerJoshua Lock <josh@linux.intel.com>2011-01-14 12:07:46 +0000
commitce4f8356796bc797d9156ed252a4ed638a2150d5 (patch)
treecebbda4fe021b6c16a81b6c4e372dd31db43d5e6
parent54f08d23cd7d0de6aec31f4764389ff4dab2990d (diff)
downloadpoky-ce4f8356796bc797d9156ed252a4ed638a2150d5.tar.gz
scripts/poky-qemu: Improve tmp layout assumption
If someone has changed TMPDIR in local.conf to a non-standard location, the poky-qemu script currently doesn't handle this and assumes if BUILDDIR is set, $BUILDDIR/tmp will exist. Its simple to check if this exists and if not, to ask bitbake where the directory is so this patch changes the code to do that. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xscripts/poky-qemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 67af439ea9..19305e2a81 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -204,7 +204,7 @@ SPITZ_DEFAULT_ROOTFS="poky-image-sato"
204 204
205setup_tmpdir() { 205setup_tmpdir() {
206 if [ -z "$TMPDIR" ]; then 206 if [ -z "$TMPDIR" ]; then
207 if [ "x$BUILDDIR" = "x" ]; then 207 if [ "x$BUILDDIR" = "x" -o ! -d "$BUILDDIR/tmp" ]; then
208 # BUILDDIR unset, try and get TMPDIR from bitbake 208 # BUILDDIR unset, try and get TMPDIR from bitbake
209 type -P bitbake &>/dev/null || { 209 type -P bitbake &>/dev/null || {
210 echo "In order for this script to dynamically infer paths"; 210 echo "In order for this script to dynamically infer paths";