X Tutup
Skip to content

Commit 2bfb92a

Browse files
committed
meson: Disable dmi_memory_id on arches without DMI
1 parent 2f1bcc4 commit 2bfb92a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

rules.d/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ rules = files('''
1717
60-serial.rules
1818
70-joystick.rules
1919
70-mouse.rules
20-
70-memory.rules
2120
70-touchpad.rules
2221
75-net-description.rules
2322
75-probe_mtd.rules
@@ -29,6 +28,10 @@ if conf.get('HAVE_KMOD') == 1
2928
rules += files('80-drivers.rules')
3029
endif
3130

31+
if dmi_arches.contains(host_machine.cpu_family())
32+
rules += files('70-memory.rules')
33+
endif
34+
3235
install_data(rules,
3336
install_dir : udevrulesdir)
3437

src/udev/meson.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,15 @@ udev_id_progs = [['ata_id/ata_id.c'],
174174
'scsi_id/scsi_serial.c',
175175
'scsi_id/scsi.h'],
176176
['v4l_id/v4l_id.c'],
177-
['dmi_memory_id/dmi_memory_id.c'],
178177
['mtd_probe/mtd_probe.c',
179178
'mtd_probe/mtd_probe.h',
180179
'mtd_probe/probe_smartmedia.c']]
181180

181+
dmi_arches = ['x86', 'x86_64', 'aarch64', 'arm', 'ia64', 'mips']
182+
if dmi_arches.contains(host_machine.cpu_family())
183+
udev_id_progs += [['dmi_memory_id/dmi_memory_id.c']]
184+
endif
185+
182186
foreach prog : udev_id_progs
183187
executable(prog[0].split('/')[0],
184188
prog,

test/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ if conf.get('ENABLE_HWDB') == 1
133133
endif
134134
endif
135135

136-
if want_tests != false
136+
if want_tests != false and dmi_arches.contains(host_machine.cpu_family())
137137
udev_dmi_memory_id_test = find_program('udev-dmi-memory-id-test.sh')
138138
test('udev-dmi-memory-id-test',
139139
udev_dmi_memory_id_test,

0 commit comments

Comments
 (0)
X Tutup