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:36:51 +0100 |
| commit | 4e24c10952c7a52af7f2447595fd484692d35534 (patch) | |
| tree | 2aab4537aeafa197e0a35bf08b71d62d2a908b0b /scripts | |
| parent | 05a46d74ca1a1d9256d454d6ba022a76f287e21c (diff) | |
| download | openembedded-core-4e24c10952c7a52af7f2447595fd484692d35534.tar.gz openembedded-core-4e24c10952c7a52af7f2447595fd484692d35534.tar.bz2 openembedded-core-4e24c10952c7a52af7f2447595fd484692d35534.tar.xz openembedded-core-4e24c10952c7a52af7f2447595fd484692d35534.zip | |
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]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/oe-setup-rpmrepo | 8 | ||||
| -rw-r--r-- | scripts/qemuimage-testlib | 4 | ||||
| -rwxr-xr-x | scripts/runqemu | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo index 03372b619..fc2f7a8c0 100755 --- a/scripts/oe-setup-rpmrepo +++ b/scripts/oe-setup-rpmrepo @@ -17,9 +17,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# Don't use TMPDIR from the external environment, it may be a distro +# variable pointing to /tmp (e.g. within X on OpenSUSE) +# Instead, use OE_TMPDIR for passing this in externally. +TMPDIR="$OE_TMPDIR" + function usage() { echo "Usage: $0 <rpm-dir>" - echo " <rpm-dir>: default is $TPMDIR/deploy/rpm" + echo " <rpm-dir>: default is $TMPDIR/deploy/rpm" } if [ $# -gt 1 ]; then diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 9ffaa7c78..6a1b9002a 100644 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -467,8 +467,8 @@ Test_Create_Qemu() export MACHINE=$QEMUARCH # Create Qemu in localhost VNC Port 1 - echo "Running xterm -display ${DISPLAY} -e 'TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &" - xterm -display ${DISPLAY} -e "TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" & + echo "Running xterm -display ${DISPLAY} -e 'OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &" + xterm -display ${DISPLAY} -e "OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" & # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu PID=$! diff --git a/scripts/runqemu b/scripts/runqemu index 0f943b5fe..31e982269 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -55,6 +55,11 @@ SCRIPT_QEMU_OPT="" SCRIPT_QEMU_EXTRA_OPT="" SCRIPT_KERNEL_OPT="" +# Don't use TMPDIR from the external environment, it may be a distro +# variable pointing to /tmp (e.g. within X on OpenSUSE) +# Instead, use OE_TMPDIR for passing this in externally. +TMPDIR="$OE_TMPDIR" + # Determine whether the file is a kernel or QEMU image, and set the # appropriate variables process_filename() { @@ -260,7 +265,7 @@ SPITZ_DEFAULT_FSTYPE=ext3 setup_tmpdir() { if [ -z "$TMPDIR" ]; then - # BUILDDIR unset, try and get TMPDIR from bitbake + # Try to get TMPDIR from bitbake type -P bitbake &>/dev/null || { echo "In order for this script to dynamically infer paths"; echo "to kernels or filesystem images, you either need"; |