From 8a8345a66bd5268d499a06358c9fbecd0385fc0b Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Mon, 19 Jul 2021 22:03:14 +0200
Subject: [PATCH] image-base: Add can tools based on MACHINE_FEATURES

BugzID: 73593
---
 recipes-core/images/netmodule-linux-image.bb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 6690527..01671ec 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -50,6 +50,7 @@ IMAGE_INSTALL_append = " \
                 curl \
                 less \
                 nmhw-auto-part \
+                ${@bb.utils.contains("MACHINE_FEATURES", "can", "can-utils", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "wwan", "${WWAN_TOOLS}", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
                 ${FIRMWARE} \
@@ -64,7 +65,6 @@ IMAGE_INSTALL_append = " \
                 "
 
 IMAGE_INSTALL_append_am335x-nrhw16 = " \
-                canutils \
                 wakeup-timer \
                 "
 
@@ -73,7 +73,6 @@ IMAGE_INSTALL_append_armada-385-nrhw18 = " \
                 "
 
 IMAGE_INSTALL_append_am335x-nmhw21 = " \
-                can-utils \
                 spitools \
                 socat \
                 cryptodev-module \
@@ -84,13 +83,6 @@ IMAGE_INSTALL_append_am335x-nmhw21 = " \
                 packagegroup-system-state-framework \
                 "
 
-IMAGE_INSTALL_append_am335x-nrhw20 = " \
-                can-utils \
-                "
-
-IMAGE_INSTALL_append_am335x-nmhw24  = " \
-                can-utils \
-                "
 
 IMAGE_INSTALL_append_imx8-nmhw23 = " \
     dfu-util \
@@ -98,7 +90,6 @@ IMAGE_INSTALL_append_imx8-nmhw23 = " \
     packagegroup-ublox-modules \
     gnss-init \
     gnss-mgr \
-    can-utils \
     spitools \
     imu-setup \
     chrony \