diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-04 17:35:10 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-10 08:11:27 +0000 |
| commit | 735cec6f6c2eee29dc69f2a1609f7d92f3e56e4a (patch) | |
| tree | f5bbaa493ce3bfe301e4d22b16580eaedea721a9 /conf/distro/b2qt.conf | |
| parent | 9585a16c9668f8aacba7ce72d5061fc38c4745e0 (diff) | |
| download | meta-boot2qt-735cec6f6c2eee29dc69f2a1609f7d92f3e56e4a.tar.gz | |
qbsp: move the qbsp content definition from distro conf
qbsp-image creation broke builds where MACHINE did not have conf file
distro/include/${MACHINE}.conf, since it was expecting to find .img as
a result of the image build.
Change-Id: I686684f86f94b4c227ba40dd17fd8bb14e705b9d
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'conf/distro/b2qt.conf')
| -rw-r--r-- | conf/distro/b2qt.conf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index ce0328c..81cc98b 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
| @@ -81,11 +81,6 @@ PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" | |||
| 81 | IMAGE_FSTYPES = "conf" | 81 | IMAGE_FSTYPES = "conf" |
| 82 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" | 82 | IMAGE_CLASSES += "image_types_sdcard deploy-conf" |
| 83 | 83 | ||
| 84 | QBSP_IMAGE_CONTENT ?= "\ | ||
| 85 | ${IMAGE_LINK_NAME}.img \ | ||
| 86 | ${IMAGE_LINK_NAME}.conf \ | ||
| 87 | " | ||
| 88 | |||
| 89 | LICENSE_CREATE_PACKAGE = "1" | 84 | LICENSE_CREATE_PACKAGE = "1" |
| 90 | COPY_LIC_MANIFEST = "1" | 85 | COPY_LIC_MANIFEST = "1" |
| 91 | 86 | ||