diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-09-28 16:28:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 21:41:43 +0100 |
commit | 7d1e1018f4ae0a0bd25aef1987730deb170c7f03 (patch) | |
tree | 95742e7a7efe329c670080135a319afe3d789ce2 /scripts/runqemu | |
parent | 47b1ea7b6f1b77c66ca71dea26719d989f3f5257 (diff) | |
download | poky-7d1e1018f4ae0a0bd25aef1987730deb170c7f03.tar.gz |
scripts: use OE_TMPDIR instead of TMPDIR external variable
On OpenSUSE within an X session, TMPDIR is set to the system temporary
directory (/tmp) which is incorrect for these scripts. Thus, change
runqemu and oe-setup-rpmrepo to use OE_TMPDIR from the external
environment rather than TMPDIR.
Fixes [YOCTO #1530]
(From OE-Core rev: 4e24c10952c7a52af7f2447595fd484692d35534)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 0f943b5fec..31e9822693 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -55,6 +55,11 @@ SCRIPT_QEMU_OPT="" | |||
55 | SCRIPT_QEMU_EXTRA_OPT="" | 55 | SCRIPT_QEMU_EXTRA_OPT="" |
56 | SCRIPT_KERNEL_OPT="" | 56 | SCRIPT_KERNEL_OPT="" |
57 | 57 | ||
58 | # Don't use TMPDIR from the external environment, it may be a distro | ||
59 | # variable pointing to /tmp (e.g. within X on OpenSUSE) | ||
60 | # Instead, use OE_TMPDIR for passing this in externally. | ||
61 | TMPDIR="$OE_TMPDIR" | ||
62 | |||
58 | # Determine whether the file is a kernel or QEMU image, and set the | 63 | # Determine whether the file is a kernel or QEMU image, and set the |
59 | # appropriate variables | 64 | # appropriate variables |
60 | process_filename() { | 65 | process_filename() { |
@@ -260,7 +265,7 @@ SPITZ_DEFAULT_FSTYPE=ext3 | |||
260 | 265 | ||
261 | setup_tmpdir() { | 266 | setup_tmpdir() { |
262 | if [ -z "$TMPDIR" ]; then | 267 | if [ -z "$TMPDIR" ]; then |
263 | # BUILDDIR unset, try and get TMPDIR from bitbake | 268 | # Try to get TMPDIR from bitbake |
264 | type -P bitbake &>/dev/null || { | 269 | type -P bitbake &>/dev/null || { |
265 | echo "In order for this script to dynamically infer paths"; | 270 | echo "In order for this script to dynamically infer paths"; |
266 | echo "to kernels or filesystem images, you either need"; | 271 | echo "to kernels or filesystem images, you either need"; |