summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-08-31 14:02:50 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-31 22:00:03 +0100
commitb397f8577e50d701cf4da76351b2192a22b522fb (patch)
treebb5ac3e1313721a2820883fa8e653ac17339f41a
parentae42f9cdbc21b55e93a9dc79ac9746a41a3b6701 (diff)
downloadopenembedded-core-contrib-b397f8577e50d701cf4da76351b2192a22b522fb.tar.gz
openembedded-core-contrib-b397f8577e50d701cf4da76351b2192a22b522fb.tar.bz2
openembedded-core-contrib-b397f8577e50d701cf4da76351b2192a22b522fb.zip
image: populate_sdk_base: add DEPLOYDIR variable
This is a preparation for changing deployment directory for image and populate_sdk targets. Introduced new variable DEPLOYDIR. Set it to current image/sdk deployment locations. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index c06dee2f0c..b3dc689881 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -74,6 +74,8 @@ IMAGE_INSTALL[type] = "list"
export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
+DEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
+
# Images are generally built explicitly, do not need to be part of world.
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 645a7f4cce..be731c05f1 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -26,6 +26,8 @@ SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
+DEPLOYDIR = "${SDK_DEPLOY}"
+
B_task-populate-sdk = "${SDK_DIR}"
SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"