Merge pull request #18001 from systemd/wip/hadess/unsupported-dmi
meson: Disable dmi_memory_id on arches without DMI
This commit is contained in:
commit
68f18549c5
|
@ -17,7 +17,6 @@ rules = files('''
|
||||||
60-serial.rules
|
60-serial.rules
|
||||||
70-joystick.rules
|
70-joystick.rules
|
||||||
70-mouse.rules
|
70-mouse.rules
|
||||||
70-memory.rules
|
|
||||||
70-touchpad.rules
|
70-touchpad.rules
|
||||||
75-net-description.rules
|
75-net-description.rules
|
||||||
75-probe_mtd.rules
|
75-probe_mtd.rules
|
||||||
|
@ -29,6 +28,10 @@ if conf.get('HAVE_KMOD') == 1
|
||||||
rules += files('80-drivers.rules')
|
rules += files('80-drivers.rules')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if dmi_arches.contains(host_machine.cpu_family())
|
||||||
|
rules += files('70-memory.rules')
|
||||||
|
endif
|
||||||
|
|
||||||
install_data(rules,
|
install_data(rules,
|
||||||
install_dir : udevrulesdir)
|
install_dir : udevrulesdir)
|
||||||
|
|
||||||
|
|
|
@ -164,7 +164,7 @@ libudevd_core = static_library(
|
||||||
link_with : udev_link_with,
|
link_with : udev_link_with,
|
||||||
dependencies : [libblkid, libkmod])
|
dependencies : [libblkid, libkmod])
|
||||||
|
|
||||||
foreach prog : [['ata_id/ata_id.c'],
|
udev_id_progs = [['ata_id/ata_id.c'],
|
||||||
['cdrom_id/cdrom_id.c'],
|
['cdrom_id/cdrom_id.c'],
|
||||||
['fido_id/fido_id.c',
|
['fido_id/fido_id.c',
|
||||||
'fido_id/fido_id_desc.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_serial.c',
|
||||||
'scsi_id/scsi.h'],
|
'scsi_id/scsi.h'],
|
||||||
['v4l_id/v4l_id.c'],
|
['v4l_id/v4l_id.c'],
|
||||||
['dmi_memory_id/dmi_memory_id.c'],
|
|
||||||
['mtd_probe/mtd_probe.c',
|
['mtd_probe/mtd_probe.c',
|
||||||
'mtd_probe/mtd_probe.h',
|
'mtd_probe/mtd_probe.h',
|
||||||
'mtd_probe/probe_smartmedia.c']]
|
'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],
|
executable(prog[0].split('/')[0],
|
||||||
prog,
|
prog,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
|
|
@ -133,7 +133,7 @@ if conf.get('ENABLE_HWDB') == 1
|
||||||
endif
|
endif
|
||||||
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')
|
udev_dmi_memory_id_test = find_program('udev-dmi-memory-id-test.sh')
|
||||||
test('udev-dmi-memory-id-test',
|
test('udev-dmi-memory-id-test',
|
||||||
udev_dmi_memory_id_test,
|
udev_dmi_memory_id_test,
|
||||||
|
|
Loading…
Reference in a new issue