From 22c9a78486a277670ef8fc9ff5b88efeddbda278 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Wed, 21 Jul 2021 12:28:38 +0200
Subject: [PATCH] base-image: Split and organize tools

BugzID: 73593
---
 recipes-core/images/netmodule-linux-image.bb | 61 +++++++++++++-------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 1dcfc10..b5a9679 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -12,61 +12,78 @@ IMAGE_FEATURES_append = " \
                 ssh-server-openssh \
                 "
 
+BASE_TOOLS = " \
+                bash \
+                less \
+                curl \
+                parted \
+                mmc-utils \
+             "
+
+NET_TOOLS = " \
+                iproute2 \
+                ethtool \
+                iptables \
+                networkmanager \
+                bridge-utils \
+            "
+
 WWAN_TOOLS = " \
                 modemmanager \
                 wwan-config \
             "
+
 BT_TOOLS = " \
                 bluez5 \
                 bluez5-obex \
                 bluez5-noinst-tools \
                 ${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \
            "
+WIFI_TOOLS = " \
+                hostapd \
+                iw \
+                wpa-supplicant \
+                wireless-regdb-static \
+              "
 
 TIME_TOOLS = " \
                 chrony \
                 chronyc \
              "
 
+NM_TOOLS = " \
+                nmhw-auto-part \
+                udev-rules-nmhw \
+                nmhw-fwupdate \
+                packagegroup-system-state-framework \
+           "
+
 IMAGE_INSTALL_append = " \
-                hostapd \
-                iw \
-                wpa-supplicant \
+                ${BASE_TOOLS} \
+                ${NET_TOOLS} \
+                ${NM_TOOLS} \
+                ${TIME_TOOLS} \
+                ${FIRMWARE} \
                 openssh-sftp-server \
                 haveged \
-                bash \
-                iproute2 \
-                ethtool \
                 openvpn \
-                iptables \
                 pciutils \
                 kernel-modules \
-                networkmanager \
                 packagegroup-netmodule-linux \
-                parted \
                 rng-tools \
-                bridge-utils \
                 gpsd \
                 gps-utils \
-                curl \
-                less \
                 socat \
                 cryptodev-module \
-                nmhw-auto-part \
-                ${TIME_TOOLS} \
+                packagegroup-ublox-modules \
+                \
+                ${@bb.utils.contains("DISTRO_FEATURES", "custom-mac-addresses", "mac-address-set", "", d)} \
+                \
                 ${@bb.utils.contains("MACHINE_FEATURES", "can", "can-utils", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "wwan", "${WWAN_TOOLS}", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "gnss", "gnss-mgr", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "${BT_TOOLS}", "", d)} \
-                ${FIRMWARE} \
-                wireless-regdb-static \
-                udev-rules-nmhw \
-                nmhw-fwupdate \
-                packagegroup-system-state-framework \
-                packagegroup-ublox-modules \
                 ${@bb.utils.contains("MACHINE_FEATURES", "imx-boot", "", "bootloader-config", d)} \
-                mmc-utils \
-                ${@bb.utils.contains("DISTRO_FEATURES", "custom-mac-addresses", "mac-address-set", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "usb-hub-reset", "usb-hub-reset", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "v2x", "v2x-ieee802.11p", "", d)} \
                 ${@bb.utils.contains("MACHINE_FEATURES", "fpga", "fpga-image", "", d)} \