From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Wed, 12 Aug 2015 14:00:23 +0000 (+0300)
Subject: adt-installer: use DEPLOY_DIR in ANT_DEPLOY expansion
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=059db140885bad379534e6ec713f3ceb4e18faea;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

adt-installer: use DEPLOY_DIR in ANT_DEPLOY expansion

Currently adt-installer uses "${TMPDIR}/deploy/sdk/" as a deployment dir.
This doesn't interact well with DEPLOY_DIR reassignment. So let's use
"${DEPLOY_DIR}/sdk/" instead.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index c871e427c4d..346fd9e4e03 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -33,7 +33,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 PR = "r11"
 
-ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
+ADT_DEPLOY = "${DEPLOY_DIR}/sdk/"
 ADT_DIR = "${WORKDIR}/adt-installer/"
 S = "${WORKDIR}/opkg-${PV}"