diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-11-01 10:13:58 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-11-03 14:11:34 +0000 |
commit | 57f2d6e8c7a518b50981674849014c1640022563 (patch) | |
tree | dbc82561185727d9d961cd79622b2dc9c0a45a8f /recipes/packagegroup | |
parent | d1014d8b2e40f36cd85d75cfd3732f6b124dab2f (diff) | |
download | meta-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 'recipes/packagegroup')
-rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 28 | ||||
-rw-r--r-- | recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 14 |
2 files changed, 14 insertions, 28 deletions
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 55394d6..b5bb73d 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | |||
@@ -33,42 +33,24 @@ PR = "r0" | |||
33 | 33 | ||
34 | inherit packagegroup | 34 | inherit packagegroup |
35 | 35 | ||
36 | MACHINE_EXTRA_INSTALL ?= "" | ||
37 | |||
36 | RDEPENDS_${PN} = "\ | 38 | RDEPENDS_${PN} = "\ |
37 | kernel-modules \ | 39 | kernel-modules \ |
38 | adbd \ | 40 | linux-firmware \ |
39 | openssh-sftp-server \ | ||
40 | openssl \ | ||
41 | openssl-misc \ | 41 | openssl-misc \ |
42 | libpng \ | ||
43 | tiff \ | ||
44 | libxslt \ | ||
45 | icu \ | ||
46 | freetype \ | ||
47 | fontconfig \ | ||
48 | liberation-fonts \ | ||
49 | tslib \ | ||
50 | tslib-calibrate \ | ||
51 | alsa-utils-amixer \ | ||
52 | hunspell \ | ||
53 | ca-certificates \ | 42 | ca-certificates \ |
54 | linux-firmware \ | 43 | liberation-fonts \ |
55 | ttf-devanagari \ | 44 | ttf-devanagari \ |
56 | ttf-opensans \ | 45 | ttf-opensans \ |
57 | ttf-dejavu-common \ | 46 | ttf-dejavu-common \ |
58 | ttf-dejavu-sans \ | 47 | ttf-dejavu-sans \ |
59 | dbus-session-init \ | ||
60 | otf-noto \ | 48 | otf-noto \ |
61 | libmysqlclient \ | 49 | dbus-session-init \ |
62 | libpq \ | ||
63 | tzdata \ | 50 | tzdata \ |
64 | tzdata-americas \ | 51 | tzdata-americas \ |
65 | tzdata-asia \ | 52 | tzdata-asia \ |
66 | tzdata-europe \ | 53 | tzdata-europe \ |
67 | atk \ | ||
68 | libevent \ | ||
69 | ostree \ | ||
70 | dracut \ | ||
71 | connman \ | 54 | connman \ |
72 | ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \ | ||
73 | ${MACHINE_EXTRA_INSTALL} \ | 55 | ${MACHINE_EXTRA_INSTALL} \ |
74 | " | 56 | " |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index 17b278c..82f67b0 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | |||
@@ -34,15 +34,19 @@ PR = "r0" | |||
34 | inherit packagegroup | 34 | inherit packagegroup |
35 | 35 | ||
36 | RDEPENDS_${PN} = "\ | 36 | RDEPENDS_${PN} = "\ |
37 | ldd \ | 37 | adbd \ |
38 | alsa-utils-amixer \ | ||
38 | binutils \ | 39 | binutils \ |
39 | binutils-symlinks \ | 40 | binutils-symlinks \ |
40 | i2c-tools \ | ||
41 | perf \ | ||
42 | htop \ | ||
43 | ntp \ | ||
44 | connman-client \ | 41 | connman-client \ |
42 | htop \ | ||
43 | i2c-tools \ | ||
45 | iproute2 \ | 44 | iproute2 \ |
45 | ldd \ | ||
46 | ntp \ | ||
47 | openssh-sftp-server \ | ||
48 | perf \ | ||
46 | rsync \ | 49 | rsync \ |
50 | tslib-calibrate \ | ||
47 | ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ | 51 | ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ |
48 | " | 52 | " |