summaryrefslogtreecommitdiffstats
path: root/conf/distro/b2qt.conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-01 10:13:58 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-03 14:11:34 +0000
commit57f2d6e8c7a518b50981674849014c1640022563 (patch)
treedbc82561185727d9d961cd79622b2dc9c0a45a8f /conf/distro/b2qt.conf
parentd1014d8b2e40f36cd85d75cfd3732f6b124dab2f (diff)
downloadmeta-boot2qt-57f2d6e8c7a518b50981674849014c1640022563.tar.gz
images: do not explicitly define Qt dependency packages
Remove all Qt dependency packages from machine include files and base packagegroups, instead let packagemanager pull in all the needed dependent packages. Do not create tar image or bootfs, since they are not used anymore. The old base image is now renamed for CI usage and contains all the Qt dependent packages but without any Qt modules. This is achieved by first installing all the Qt modules (which pulls in all the dependencies) and then removing only Qt modules. Change-Id: I36d996d4531af42e955f19a487c22d0b90c5ada9 Reviewed-by: Risto Avila <risto.avila@qt.io>
Diffstat (limited to 'conf/distro/b2qt.conf')
-rw-r--r--conf/distro/b2qt.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index c488d5c..9a59812 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -68,8 +68,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
68PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" 68PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
69PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" 69PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
70 70
71MACHINE_EXTRA_INSTALL ?= ""
72
73# Override mkspec for mingw build 71# Override mkspec for mingw build
74OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" 72OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
75OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" 73OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
@@ -79,7 +77,7 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1"
79 77
80PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" 78PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
81 79
82IMAGE_FSTYPES = "tar.gz conf" 80IMAGE_FSTYPES = "conf"
83IMAGE_CLASSES += "image_types_sdcard deploy-conf" 81IMAGE_CLASSES += "image_types_sdcard deploy-conf"
84 82
85LICENSE_CREATE_PACKAGE = "1" 83LICENSE_CREATE_PACKAGE = "1"