summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt/classes/deploy-conf.bbclass
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-09-26 10:43:26 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2018-09-28 08:57:46 +0000
commitaa863717a1e24a3c08a94726e95493780ccff1f3 (patch)
tree51ba08637efc4f99b0caeede3032c10ce6db6aa0 /meta-boot2qt/classes/deploy-conf.bbclass
parent168f62cc6d06b205a3ddcb941570103e7910e14d (diff)
downloadmeta-boot2qt-aa863717a1e24a3c08a94726e95493780ccff1f3.tar.gz
poky: update to 2.5 branch (sumo)
Update yocto from 2.3.4 (pyro) to 2.5.1 (sumo): - Update poky, meta-openembedded & meta-mingw to sumo branch - update image classes (obsolete IMAGE_DEPENDS definitions) - Update bbappends under meta-boot2qt-distro - Update meta-*-extras layers bbappends & patches All recipes related to nitrogen6x are fixed here, but this depends on follow up commits to work correctly. Task-number: QTBUG-68681 Change-Id: Ic5802c5c1a3989bed746f96f8cf173743ec755bb Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt/classes/deploy-conf.bbclass')
-rw-r--r--meta-boot2qt/classes/deploy-conf.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-boot2qt/classes/deploy-conf.bbclass b/meta-boot2qt/classes/deploy-conf.bbclass
index 22c6ef7..4999d4d 100644
--- a/meta-boot2qt/classes/deploy-conf.bbclass
+++ b/meta-boot2qt/classes/deploy-conf.bbclass
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2018 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -29,7 +29,7 @@
29 29
30inherit image_types 30inherit image_types
31 31
32IMAGE_DEPENDS_conf = "qtbase-native" 32do_image_conf[depends] += "qtbase-native:do_populate_sysroot"
33 33
34DEPLOY_CONF_NAME ?= "${MACHINE}" 34DEPLOY_CONF_NAME ?= "${MACHINE}"
35DEPLOY_CONF_TYPE ?= "Boot2Qt" 35DEPLOY_CONF_TYPE ?= "Boot2Qt"