Eliminate kmod dependency

Changes to rules were introduced by
06316d9 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 <ryao@gentoo.org>

configure.ac

@@ -38,9 +38,7 @@ if test -z "$GPERF" ; then
         AC_MSG_ERROR([*** gperf not found])
 fi
 
-# TODO check this --- we don't want kmod necessarily
-PKG_CHECK_MODULES(KMOD, [libkmod >= 5])
-PKG_CHECK_MODULES(BLKID,[blkid >= 2.20])
+# PKG_CHECK_MODULES(BLKID,[blkid >= 2.20])
 
 # Checks for header files.
 AC_CHECK_HEADERS(

rules/75-probe_mtd.rules

@@ -3,6 +3,6 @@
 ACTION!="add", GOTO="mtd_probe_end"
 
 KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $devnode"
-KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl"
+KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN+="@sbindir@/modprobe -bv sm_ftl"
 
 LABEL="mtd_probe_end"

rules/80-drivers.rules

@@ -2,11 +2,11 @@
 
 ACTION=="remove", GOTO="drivers_end"
 
-DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", IMPORT{builtin}="kmod load tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", IMPORT{builtin}="kmod load tifm_ms"
-SUBSYSTEM=="memstick", IMPORT{builtin}="kmod load ms_block mspro_block"
-SUBSYSTEM=="i2o", IMPORT{builtin}="kmod load i2o_block"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="@sbindir@/modprobe -bv $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="@sbindir@/modprobe -bv tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="@sbindir@/modprobe -bv tifm_ms"
+SUBSYSTEM=="memstick", RUN+="@sbindir@/modprobe -bv --all ms_block mspro_block"
+SUBSYSTEM=="i2o", RUN+="@sbindir@/modprobe -bv i2o_block"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="@sbindir@/modprobe -bv ppdev"
 
 LABEL="drivers_end"

src/test/Makefile.am

@@ -16,6 +16,5 @@ test_udev_SOURCES = \
 test_udev_LDADD = \
 	libudev-core.la \
 	$(BLKID_LIBS) \
-	$(KMOD_LIBS) \
 	$(SELINUX_LIBS)
 

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 += \

src/udev/udev-builtin.c

@@ -35,7 +35,6 @@ static const struct udev_builtin *builtins[] = {
         [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
         [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
         [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
-        [UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
         [UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
         [UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
         [UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,

src/udev/udev.h

@@ -139,7 +139,6 @@ enum udev_builtin_cmd {
         UDEV_BUILTIN_FIRMWARE,
         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_INPUT_ID,
-        UDEV_BUILTIN_KMOD,
         UDEV_BUILTIN_NET_ID,
         UDEV_BUILTIN_PATH_ID,
         UDEV_BUILTIN_USB_ID,
@@ -162,7 +161,6 @@ extern const struct udev_builtin udev_builtin_btrfs;
 extern const struct udev_builtin udev_builtin_firmware;
 extern const struct udev_builtin udev_builtin_hwdb;
 extern const struct udev_builtin udev_builtin_input_id;
-extern const struct udev_builtin udev_builtin_kmod;
 extern const struct udev_builtin udev_builtin_net_id;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_usb_id;