From 409ebc3c48b0923790b239c5bc0d381b68e38782 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Jan 2019 12:39:17 +0200 Subject: 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 --- .../recipes-core/packagegroups/packagegroup-b2qt-embedded-tools.bb | 2 -- meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb | 1 + meta-boot2qt-distro/recipes-qt/images/b2qt-automotive-qt5-image.bb | 1 + meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt5-image.bb | 3 ++- 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} = "\ iproute2 \ ldd \ openssh-sftp-server \ - perf \ procps \ rsync \ tslib-calibrate \ - valgrind \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ " 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 += "\ package-management \ ssh-server-dropbear \ tools-debug \ + tools-profile \ debug-tweaks \ hwcodecs \ " 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 += "\ package-management \ ssh-server-dropbear \ tools-debug \ + tools-profile \ debug-tweaks \ hwcodecs \ " 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 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -37,6 +37,7 @@ IMAGE_FEATURES += "\ package-management \ ssh-server-dropbear \ tools-debug \ + tools-profile \ debug-tweaks \ hwcodecs \ " -- cgit v1.2.3-54-g00ecf