summaryrefslogtreecommitdiffstats
path: root/meta
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-09-04 00:07:28 +0100
commit619d2996fbb12e6ab63daa73b2d9683023cc2744 (patch)
tree33ac3629e1270767a68fdb8c374d5975af09f13f /meta
parent51afd4515f7373765e7fbe15aefc63668d927f5a (diff)
downloadpoky-619d2996fbb12e6ab63daa73b2d9683023cc2744.tar.gz
image/populate_sdk_base: Add *DEPLOYDIR variables
This is a preparation for changing deployment directory for image and populate_sdk targets. Introduced new variables, IMGDEPLOYDIR and SDKDEPLOYDIR. Set it to current image/sdk deployment locations. (From OE-Core rev: 8969b885044eb46dba3dbf62a0243aef673443d3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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..52c740c384 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -74,6 +74,8 @@ IMAGE_INSTALL[type] = "list"
74export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}" 74export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL} ${FEATURE_INSTALL}"
75PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}" 75PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
76 76
77IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
78
77# Images are generally built explicitly, do not need to be part of world. 79# Images are generally built explicitly, do not need to be part of world.
78EXCLUDE_FROM_WORLD = "1" 80EXCLUDE_FROM_WORLD = "1"
79 81
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 645a7f4cce..0a85a98d06 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -26,6 +26,8 @@ SDK_DIR = "${WORKDIR}/sdk"
26SDK_OUTPUT = "${SDK_DIR}/image" 26SDK_OUTPUT = "${SDK_DIR}/image"
27SDK_DEPLOY = "${DEPLOY_DIR}/sdk" 27SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
28 28
29SDKDEPLOYDIR = "${SDK_DEPLOY}"
30
29B_task-populate-sdk = "${SDK_DIR}" 31B_task-populate-sdk = "${SDK_DIR}"
30 32
31SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}" 33SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"