Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Viguera 2023-03-21 17:05:15 +01:00
parent 661f59967c
commit d76bb3ac2c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/conf/machine/include/ccmp1.inc
View File

@ -42,9 +42,6 @@ MACHINE_EXTRA_RDEPENDS += " \
mtd-utils-ubifs \ mtd-utils-ubifs \
" "
# Extra udev rules
MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
# Image FS types # Image FS types
IMAGE_FSTYPES:remove = "ext4 tar.xz" IMAGE_FSTYPES:remove = "ext4 tar.xz"

4
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -72,6 +72,10 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${@bb.utils.contains("MACHINE_FEATURES", "cryptochip", "cryptoauthlib", "", d)} \ ${@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 (for install scripts)
DEFAULT_IMAGE_NAME ??= "dey-image-qt" DEFAULT_IMAGE_NAME ??= "dey-image-qt"

6
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -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: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)}" 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 # GStreamer 1.0 plugins
MACHINE_GSTREAMER_1_0_PLUGIN ?= "" MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl-nxp-bsp ?= "imx-gst1.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" 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 # Add a generic gstreamer distro feature for all IMX platforms
DISTRO_FEATURES:append = " gstreamer" DISTRO_FEATURES:append = " gstreamer"