meson: Disable dmi_memory_id on arches without DMI

diff --git a/rules.d/meson.build b/rules.d/meson.build
index 650addc3b37317e17dd526bca99884d40bd28092..d29564513da1567e6559b034622901d1430ae158 100644 (file)
--- 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 17c9b78d91191448481c09ecd0f51fd2e04b154e..0ed3b861356177788a5da0d64f44da66407a61d0 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -174,11 +174,15 @@ udev_id_progs = [['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,

diff --git a/test/meson.build b/test/meson.build
index a71cf24eaf6257984437de6b72597f49b8440fe6..3a930436f9655d1b25971998786f5e8ff024e34b 100644 (file)
--- 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,