summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-28 16:28:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 21:41:43 +0100
commit7d1e1018f4ae0a0bd25aef1987730deb170c7f03 (patch)
tree95742e7a7efe329c670080135a319afe3d789ce2
parent47b1ea7b6f1b77c66ca71dea26719d989f3f5257 (diff)
downloadpoky-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>
-rw-r--r--meta/classes/imagetest-qemu.bbclass2
-rwxr-xr-xscripts/oe-setup-rpmrepo8
-rwxr-xr-xscripts/qemuimage-testlib4
-rwxr-xr-xscripts/runqemu7
4 files changed, 16 insertions, 5 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 18798e025c..4ea86c04fe 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -70,7 +70,7 @@ def qemuimagetest_main(d):
70 os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True) 70 os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True)
71 os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True) 71 os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True)
72 os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True) 72 os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True)
73 os.environ["TMPDIR"] = bb.data.getVar("TMPDIR", d, True) 73 os.environ["OE_TMPDIR"] = bb.data.getVar("TMPDIR", d, True)
74 os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True) 74 os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True)
75 os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True) 75 os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True)
76 os.environ["TEST_SERIALIZE"] = bb.data.getVar("TEST_SERIALIZE", d, True) 76 os.environ["TEST_SERIALIZE"] = bb.data.getVar("TEST_SERIALIZE", d, True)
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index 03372b6199..fc2f7a8c0c 100755
--- a/scripts/oe-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
@@ -17,9 +17,15 @@
17# along with this program; if not, write to the Free Software 17# along with this program; if not, write to the Free Software
18# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 19
20
21# Don't use TMPDIR from the external environment, it may be a distro
22# variable pointing to /tmp (e.g. within X on OpenSUSE)
23# Instead, use OE_TMPDIR for passing this in externally.
24TMPDIR="$OE_TMPDIR"
25
20function usage() { 26function usage() {
21 echo "Usage: $0 <rpm-dir>" 27 echo "Usage: $0 <rpm-dir>"
22 echo " <rpm-dir>: default is $TPMDIR/deploy/rpm" 28 echo " <rpm-dir>: default is $TMPDIR/deploy/rpm"
23} 29}
24 30
25if [ $# -gt 1 ]; then 31if [ $# -gt 1 ]; then
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 9ffaa7c785..6a1b9002a4 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -467,8 +467,8 @@ Test_Create_Qemu()
467 export MACHINE=$QEMUARCH 467 export MACHINE=$QEMUARCH
468 468
469 # Create Qemu in localhost VNC Port 1 469 # Create Qemu in localhost VNC Port 1
470 echo "Running xterm -display ${DISPLAY} -e 'TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &" 470 echo "Running xterm -display ${DISPLAY} -e 'OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60' &"
471 xterm -display ${DISPLAY} -e "TMPDIR=${TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" & 471 xterm -display ${DISPLAY} -e "OE_TMPDIR=${OE_TMPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE} && /bin/sleep 60" &
472 472
473 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu 473 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
474 PID=$! 474 PID=$!
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=""
55SCRIPT_QEMU_EXTRA_OPT="" 55SCRIPT_QEMU_EXTRA_OPT=""
56SCRIPT_KERNEL_OPT="" 56SCRIPT_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.
61TMPDIR="$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
60process_filename() { 65process_filename() {
@@ -260,7 +265,7 @@ SPITZ_DEFAULT_FSTYPE=ext3
260 265
261setup_tmpdir() { 266setup_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";