diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-10 12:39:17 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-11 08:48:04 +0000 |
commit | 409ebc3c48b0923790b239c5bc0d381b68e38782 (patch) | |
tree | d8b4e69d9df01880e34603609fc88ac48dbcebd1 | |
parent | 402191df19faa576e8b0635d7864868739af274b (diff) | |
download | meta-boot2qt-409ebc3c48b0923790b239c5bc0d381b68e38782.tar.gz |
Use tools-profile IMAGE_FEATURE
Use tools-profile to bring valgrind and perf to the image.
valgrind is not available for all architectures and including
it in the image caused build failure.
Change-Id: Ibdcd7098d0375d200416942779b2e36a89913d9d
Fixes: QTBUG-70379
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
4 files changed, 4 insertions, 3 deletions
diff --git a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb index 7dd1604..993cdeb 100644 --- a/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb +++ b/meta-boot2qt-distro/recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb | |||
@@ -44,10 +44,8 @@ RDEPENDS_${PN} = "\ | |||
44 | iproute2 \ | 44 | iproute2 \ |
45 | ldd \ | 45 | ldd \ |
46 | openssh-sftp-server \ | 46 | openssh-sftp-server \ |
47 | perf \ | ||
48 | procps \ | 47 | procps \ |
49 | rsync \ | 48 | rsync \ |
50 | tslib-calibrate \ | 49 | tslib-calibrate \ |
51 | valgrind \ | ||
52 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ | 50 | ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ |
53 | " | 51 | " |
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb index 25bfb4d..2442a39 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb | |||
@@ -37,6 +37,7 @@ IMAGE_FEATURES += "\ | |||
37 | package-management \ | 37 | package-management \ |
38 | ssh-server-dropbear \ | 38 | ssh-server-dropbear \ |
39 | tools-debug \ | 39 | tools-debug \ |
40 | tools-profile \ | ||
40 | debug-tweaks \ | 41 | debug-tweaks \ |
41 | hwcodecs \ | 42 | hwcodecs \ |
42 | " | 43 | " |
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb index b9c5fd0..eb5232e 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb | |||
@@ -37,6 +37,7 @@ IMAGE_FEATURES += "\ | |||
37 | package-management \ | 37 | package-management \ |
38 | ssh-server-dropbear \ | 38 | ssh-server-dropbear \ |
39 | tools-debug \ | 39 | tools-debug \ |
40 | tools-profile \ | ||
40 | debug-tweaks \ | 41 | debug-tweaks \ |
41 | hwcodecs \ | 42 | hwcodecs \ |
42 | " | 43 | " |
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb index 3ccfa09..1c49bc4 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | ############################################################################ | 1 | ############################################################################ |
2 | ## | 2 | ## |
3 | ## Copyright (C) 2016 The Qt Company Ltd. | 3 | ## Copyright (C) 2019 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. |
@@ -37,6 +37,7 @@ IMAGE_FEATURES += "\ | |||
37 | package-management \ | 37 | package-management \ |
38 | ssh-server-dropbear \ | 38 | ssh-server-dropbear \ |
39 | tools-debug \ | 39 | tools-debug \ |
40 | tools-profile \ | ||
40 | debug-tweaks \ | 41 | debug-tweaks \ |
41 | hwcodecs \ | 42 | hwcodecs \ |
42 | " | 43 | " |