mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-26 08:55:18 +03:00
udev: use LOG_REALM_UDEV in all udev code
Any call to set/query/use the log level in the code with LOG_REALM=LOG_REALM_UDEV refers to log_max_level[1]. In particular this means that systemd code using the libudev library uses does not set the log level for log calls done in libudev. Fixes #4525. v2: - also update meson's meson.build
This commit is contained in:
parent
ff524019ef
commit
5c72049f91
31
Makefile.am
31
Makefile.am
@ -3913,7 +3913,8 @@ gperf_gperf_sources += \
|
||||
libudev_core_la_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
$(BLKID_CFLAGS) \
|
||||
$(KMOD_CFLAGS)
|
||||
$(KMOD_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
libudev_core_la_LIBADD = \
|
||||
libsystemd-network.la \
|
||||
@ -3945,6 +3946,10 @@ endif
|
||||
systemd_udevd_SOURCES = \
|
||||
src/udev/udevd.c
|
||||
|
||||
systemd_udevd_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
systemd_udevd_LDADD = \
|
||||
libudev-core.la \
|
||||
libbasic.la
|
||||
@ -4088,6 +4093,10 @@ EXTRA_DIST += \
|
||||
ata_id_SOURCES = \
|
||||
src/udev/ata_id/ata_id.c
|
||||
|
||||
ata_id_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
ata_id_LDADD = \
|
||||
libshared.la
|
||||
|
||||
@ -4098,6 +4107,10 @@ udevlibexec_PROGRAMS += \
|
||||
cdrom_id_SOURCES = \
|
||||
src/udev/cdrom_id/cdrom_id.c
|
||||
|
||||
cdrom_id_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
cdrom_id_LDADD = \
|
||||
libshared.la
|
||||
|
||||
@ -4111,6 +4124,10 @@ dist_udevrules_DATA += \
|
||||
collect_SOURCES = \
|
||||
src/udev/collect/collect.c
|
||||
|
||||
collect_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
collect_LDADD = \
|
||||
libshared.la
|
||||
|
||||
@ -4124,6 +4141,10 @@ scsi_id_SOURCES =\
|
||||
src/udev/scsi_id/scsi.h \
|
||||
src/udev/scsi_id/scsi_id.h
|
||||
|
||||
scsi_id_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
scsi_id_LDADD = \
|
||||
libshared.la
|
||||
|
||||
@ -4137,6 +4158,10 @@ EXTRA_DIST += \
|
||||
v4l_id_SOURCES = \
|
||||
src/udev/v4l_id/v4l_id.c
|
||||
|
||||
v4l_id_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
v4l_id_LDADD = \
|
||||
libshared.la
|
||||
|
||||
@ -4152,6 +4177,10 @@ mtd_probe_SOURCES = \
|
||||
src/udev/mtd_probe/mtd_probe.h \
|
||||
src/udev/mtd_probe/probe_smartmedia.c
|
||||
|
||||
mtd_probe_CFLAGS = \
|
||||
$(AM_CFLAGS) \
|
||||
-DLOG_REALM=LOG_REALM_UDEV
|
||||
|
||||
dist_udevrules_DATA += \
|
||||
rules/75-probe_mtd.rules
|
||||
|
||||
|
@ -2055,6 +2055,7 @@ public_programs += [exe]
|
||||
exe = executable('systemd-udevd',
|
||||
systemd_udevd_sources,
|
||||
include_directories : includes,
|
||||
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
|
||||
link_with : [libudev_core,
|
||||
libsystemd_network,
|
||||
libudev_internal],
|
||||
|
@ -130,6 +130,7 @@ foreach prog : [['ata_id/ata_id.c'],
|
||||
executable(prog[0].split('/')[0],
|
||||
prog,
|
||||
include_directories : includes,
|
||||
c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
|
||||
link_with : [libudev_internal],
|
||||
install_rpath : udev_rpath,
|
||||
install : true,
|
||||
|
Loading…
Reference in New Issue
Block a user