From d76bb3ac2c364fafe4664b2e325ea3bb77e06d61 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 21 Mar 2023 17:05:15 +0100
Subject: [PATCH] machine: restrict udev extra rules to systemd or udevd device
 managers

There are other device managers (e.g. mdev) that do not understand those
udev rules, so do not install them unconditionally.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/include/ccmp1.inc         | 3 ---
 meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 ++++
 meta-digi-arm/conf/machine/include/imx-digi-base.inc | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 49c5f4c1b..aad915529 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -42,9 +42,6 @@ MACHINE_EXTRA_RDEPENDS += " \
     mtd-utils-ubifs \
 "
 
-# Extra udev rules
-MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
-
 # Image FS types
 IMAGE_FSTYPES:remove = "ext4 tar.xz"
 
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index d27c3dcfb..cb28faf61 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -72,6 +72,10 @@ MACHINE_EXTRA_RRECOMMENDS += " \
     ${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \
 "
 
+# Extra rules when device manager is systemd or udev
+UDEV_EXTRA_RULES = "udev-extraconf"
+MACHINE_EXTRA_RRECOMMENDS += "${@bb.utils.contains_any('VIRTUAL-RUNTIME_dev_manager', 'systemd udev', '${UDEV_EXTRA_RULES}', '', d)}"
+
 # Default image name (for install scripts)
 DEFAULT_IMAGE_NAME ??= "dey-image-qt"
 
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index 19deabe9d..e0492d86a 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -208,9 +208,6 @@ IMX_ALSA_EXTRA:imx-nxp-bsp = "imx-alsa-plugins"
 MACHINE_EXTRA_RRECOMMENDS:append:mx6-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
 MACHINE_EXTRA_RRECOMMENDS:append:mx8-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
 
-# Extra udev rules
-MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-imx"
-
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN                ?= ""
 MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp  ?= "imx-gst1.0-plugin"
@@ -292,6 +289,9 @@ KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
+# IMX specific udev extra rules added when device manager is systemd/udev
+UDEV_EXTRA_RULES:append = " udev-rules-imx"
+
 # Add a generic gstreamer distro feature for all IMX platforms
 DISTRO_FEATURES:append =  " gstreamer"