From 2d28aaeb1e7449ce6e179969dc199879e97dff9a Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Thu, 17 Dec 2020 11:23:47 +0100 Subject: [PATCH] image-dev: moved monitoring tools from image to dev image system monitor and the netmodule scripts for creating a support package were moved to dev image Signed-off-by: Marc Mattmueller --- recipes-core/images/netmodule-linux-image-dev.bb | 6 ++++++ recipes-core/images/netmodule-linux-image.bb | 2 -- recipes-tools/sys-mon/sys-mon_git.bb | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb index 10e1ece..2be613d 100644 --- a/recipes-core/images/netmodule-linux-image-dev.bb +++ b/recipes-core/images/netmodule-linux-image-dev.bb @@ -6,6 +6,11 @@ IMAGE_FEATURES_append = " \ tools-debug \ " +MONITORING = " \ + sys-mon \ + scripts-nm \ + " + BENCH_TOOLS = " \ tcpdump \ lmbench \ @@ -42,6 +47,7 @@ IMAGE_INSTALL_append = " \ ${BENCH_TOOLS} \ ${EASY_EDITOR} \ ${GPS_TOOLS} \ + ${MONITORING} \ python3 \ python3-misc \ python3-pip \ diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb index b1ff97a..f265ee6 100644 --- a/recipes-core/images/netmodule-linux-image.bb +++ b/recipes-core/images/netmodule-linux-image.bb @@ -58,8 +58,6 @@ IMAGE_INSTALL_append = " \ udev-rules-nmhw \ nmhw-fwupdate \ ${@bb.utils.contains("MACHINE_FEATURES", "imx-boot", "", "bootloader-config", d)} \ - sys-mon \ - scripts-nm \ mmc-utils \ " diff --git a/recipes-tools/sys-mon/sys-mon_git.bb b/recipes-tools/sys-mon/sys-mon_git.bb index 053752c..1cc22e8 100644 --- a/recipes-tools/sys-mon/sys-mon_git.bb +++ b/recipes-tools/sys-mon/sys-mon_git.bb @@ -23,8 +23,6 @@ B = "${S}/build" SYSTEMD_SERVICE_${PN} = "sys-mon.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" - FILES_${PN} += " \ ${bindir}/sys-mon \ ${systemd_system_unitdir}/sys-mon.service \