From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1R8sZc-0003Sa-ML for openembedded-core@lists.openembedded.org; Wed, 28 Sep 2011 13:45:12 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 28 Sep 2011 04:39:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,455,1312182000"; d="scan'208";a="68239574" Received: from unknown (HELO helios.ger.corp.intel.com) ([10.252.120.175]) by fmsmga001.fm.intel.com with ESMTP; 28 Sep 2011 04:39:45 -0700 From: Paul Eggleton To: openembedded-core@lists.openembedded.org Date: Wed, 28 Sep 2011 12:39:40 +0100 Message-Id: <84f26e49034f00a6df1eeb9d918de6bb7e8347fc.1317209028.git.paul.eggleton@linux.intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 1/2] scripts: use OE_TMPDIR instead of TMPDIR external variable X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Sep 2011 11:45:12 -0000 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 --- scripts/oe-setup-rpmrepo | 8 +++++++- scripts/qemuimage-testlib | 4 ++-- scripts/runqemu | 7 ++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo index 03372b6..fc2f7a8 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 " - echo " : default is $TPMDIR/deploy/rpm" + echo " : default is $TMPDIR/deploy/rpm" } if [ $# -gt 1 ]; then diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 9ffaa7c..6a1b900 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 0f943b5..31e9822 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"; -- 1.7.4.1