From 070251f36bcf15a07a02ec8054ce1fde6c506edf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Feb 2017 12:36:04 +0100 Subject: Revert "Makefile.am: add a `\` (#5422)" This reverts commit 00d1e0c9def4557c74f46cc2fe3a7ebc32a1dc8a. --- Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c89fa93beb..c536df7788 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4091,7 +4091,7 @@ ata_id_SOURCES = \ src/udev/ata_id/ata_id.c ata_id_CFLAGS = \ - $(AM_CFLAGS) \ + $(AM_CFLAGS) -D UDEV_PROPAGATE_LOG ata_id_LDADD = \ @@ -4105,7 +4105,7 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_CFLAGS = \ - $(AM_CFLAGS) \ + $(AM_CFLAGS) -D UDEV_PROPAGATE_LOG cdrom_id_LDADD = \ @@ -4122,7 +4122,7 @@ collect_SOURCES = \ src/udev/collect/collect.c collect_CFLAGS = \ - $(AM_CFLAGS) \ + $(AM_CFLAGS) -D UDEV_PROPAGATE_LOG collect_LDADD = \ @@ -4139,7 +4139,7 @@ scsi_id_SOURCES =\ src/udev/scsi_id/scsi_id.h scsi_id_CFLAGS = \ - $(AM_CFLAGS) \ + $(AM_CFLAGS) -D UDEV_PROPAGATE_LOG scsi_id_LDADD = \ @@ -4171,7 +4171,7 @@ mtd_probe_SOURCES = \ src/udev/mtd_probe/probe_smartmedia.c mtd_probe_CFLAGS = \ - $(AM_CFLAGS) \ + $(AM_CFLAGS) -D UDEV_PROPAGATE_LOG dist_udevrules_DATA += \ -- cgit v1.2.3-54-g00ecf From b90ef60fbc8e110cbcc47d335032e9ef2ff6d44e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 23 Feb 2017 12:36:07 +0100 Subject: Revert "udev: Introduce UDEV_PROPAGATE_LOG macro (#5302)" This reverts commit c22569eeeafa94cf510267071f5b75c4ab714e09. Let's revert this for now, since it apparently doesn't fix the problem at hand. --- Makefile.am | 23 +---------------------- src/libudev/libudev.c | 3 --- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index c536df7788..292f63c408 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3914,8 +3914,7 @@ gperf_gperf_sources += \ libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ $(BLKID_CFLAGS) \ - $(KMOD_CFLAGS) \ - -D UDEV_PROPAGATE_LOG + $(KMOD_CFLAGS) libudev_core_la_LIBADD = \ libsystemd-network.la \ @@ -4090,10 +4089,6 @@ EXTRA_DIST += \ ata_id_SOURCES = \ src/udev/ata_id/ata_id.c -ata_id_CFLAGS = \ - $(AM_CFLAGS) - -D UDEV_PROPAGATE_LOG - ata_id_LDADD = \ libshared.la @@ -4104,10 +4099,6 @@ udevlibexec_PROGRAMS += \ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c -cdrom_id_CFLAGS = \ - $(AM_CFLAGS) - -D UDEV_PROPAGATE_LOG - cdrom_id_LDADD = \ libshared.la @@ -4121,10 +4112,6 @@ dist_udevrules_DATA += \ collect_SOURCES = \ src/udev/collect/collect.c -collect_CFLAGS = \ - $(AM_CFLAGS) - -D UDEV_PROPAGATE_LOG - collect_LDADD = \ libshared.la @@ -4138,10 +4125,6 @@ scsi_id_SOURCES =\ src/udev/scsi_id/scsi.h \ src/udev/scsi_id/scsi_id.h -scsi_id_CFLAGS = \ - $(AM_CFLAGS) - -D UDEV_PROPAGATE_LOG - scsi_id_LDADD = \ libshared.la @@ -4170,10 +4153,6 @@ mtd_probe_SOURCES = \ src/udev/mtd_probe/mtd_probe.h \ src/udev/mtd_probe/probe_smartmedia.c -mtd_probe_CFLAGS = \ - $(AM_CFLAGS) - -D UDEV_PROPAGATE_LOG - dist_udevrules_DATA += \ rules/75-probe_mtd.rules diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c index 7c6aeef8dc..d8e13288b0 100644 --- a/src/libudev/libudev.c +++ b/src/libudev/libudev.c @@ -103,8 +103,6 @@ _public_ struct udev *udev_new(void) { } udev->refcount = 1; -#ifdef UDEV_PROPAGATE_LOG - f = fopen("/etc/udev/udev.conf", "re"); if (f != NULL) { char line[UTIL_LINE_SIZE]; @@ -180,7 +178,6 @@ _public_ struct udev *udev_new(void) { } } } -#endif return udev; } -- cgit v1.2.3-54-g00ecf