From a91a7609b204ba01037df4ab314dc81c0589c8cb Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Fri, 16 Nov 2012 23:15:39 -0500 Subject: Eliminate kmod dependency Changes to rules were introduced by 06316d9f1a91b4d3efdb7402e72498cb3deb1806 while kmod support was introduced in other commits. A ton of commits were made involving kmod and it is quite clear that it is broken, so we remove it. This changes our rules to depend on modprobe. As long as the modprobe binary is in /, and not /usr, udev module loading should function properly. Signed-off-by: Richard Yao --- src/udev/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/udev/Makefile.am') diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index 78e1bff269..7034028c74 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -52,7 +52,6 @@ libudev_core_la_SOURCES = \ udev-builtin-firmware.c \ udev-builtin-hwdb.c \ udev-builtin-input_id.c \ - udev-builtin-kmod.c \ udev-builtin-net_id.c \ udev-builtin-path_id.c \ udev-builtin-usb_id.c \ @@ -76,13 +75,11 @@ libudev_core_la_SOURCES = \ libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ - $(BLKID_CFLAGS) \ - $(KMOD_CFLAGS) + $(BLKID_CFLAGS) libudev_core_la_LIBADD = \ $(top_srcdir)/src/libudev/libudev-private.la \ - $(BLKID_LIBS) \ - $(KMOD_LIBS) + $(BLKID_LIBS) if HAVE_ACL libudev_core_la_SOURCES += \ -- cgit v1.2.3-54-g00ecf