diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-12-17 09:16:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 09:16:33 +0100 |
| commit | 68f18549c551d677d97ebd18d27827e1613a06a7 (patch) | |
| tree | e849837810332337f95a2c5455c72b63ddcc1ce1 | |
| parent | ddbf960574a3bb4b0be3dba929ad922bfa037a99 (diff) | |
| parent | 2bfb92a9789a97adcb088a3be7a13efcd64e8c5f (diff) | |
| download | systemd-68f18549c551d677d97ebd18d27827e1613a06a7.tar.gz | |
Merge pull request #18001 from systemd/wip/hadess/unsupported-dmi
meson: Disable dmi_memory_id on arches without DMI
| -rw-r--r-- | rules.d/meson.build | 5 | ||||
| -rw-r--r-- | src/udev/meson.build | 9 | ||||
| -rw-r--r-- | test/meson.build | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/rules.d/meson.build b/rules.d/meson.build index 650addc3b3..d29564513d 100644 --- a/rules.d/meson.build +++ b/rules.d/meson.build @@ -17,7 +17,6 @@ rules = files(''' 60-serial.rules 70-joystick.rules 70-mouse.rules - 70-memory.rules 70-touchpad.rules 75-net-description.rules 75-probe_mtd.rules @@ -29,6 +28,10 @@ if conf.get('HAVE_KMOD') == 1 rules += files('80-drivers.rules') endif +if dmi_arches.contains(host_machine.cpu_family()) + rules += files('70-memory.rules') +endif + install_data(rules, install_dir : udevrulesdir) diff --git a/src/udev/meson.build b/src/udev/meson.build index d8b91f2383..0ed3b86135 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -164,7 +164,7 @@ libudevd_core = static_library( link_with : udev_link_with, dependencies : [libblkid, libkmod]) -foreach prog : [['ata_id/ata_id.c'], +udev_id_progs = [['ata_id/ata_id.c'], ['cdrom_id/cdrom_id.c'], ['fido_id/fido_id.c', 'fido_id/fido_id_desc.c', @@ -174,11 +174,16 @@ foreach prog : [['ata_id/ata_id.c'], 'scsi_id/scsi_serial.c', 'scsi_id/scsi.h'], ['v4l_id/v4l_id.c'], - ['dmi_memory_id/dmi_memory_id.c'], ['mtd_probe/mtd_probe.c', 'mtd_probe/mtd_probe.h', 'mtd_probe/probe_smartmedia.c']] +dmi_arches = ['x86', 'x86_64', 'aarch64', 'arm', 'ia64', 'mips'] +if dmi_arches.contains(host_machine.cpu_family()) + udev_id_progs += [['dmi_memory_id/dmi_memory_id.c']] +endif + +foreach prog : udev_id_progs executable(prog[0].split('/')[0], prog, include_directories : includes, diff --git a/test/meson.build b/test/meson.build index a71cf24eaf..3a930436f9 100644 --- a/test/meson.build +++ b/test/meson.build @@ -133,7 +133,7 @@ if conf.get('ENABLE_HWDB') == 1 endif endif -if want_tests != false +if want_tests != false and dmi_arches.contains(host_machine.cpu_family()) udev_dmi_memory_id_test = find_program('udev-dmi-memory-id-test.sh') test('udev-dmi-memory-id-test', udev_dmi_memory_id_test, |