From 4a9460f15a8ff198d6a9c249bdd63572509e23bb Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 23 Dec 2011 04:54:08 +0100 Subject: rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules --- Makefile.am | 14 ++------------ extras/mtd_probe/.gitignore | 1 - extras/mtd_probe/75-probe_mtd.rules | 8 ++++++++ extras/mtd_probe/75-probe_mtd.rules.in | 8 -------- rules/.gitignore | 1 - rules/rules.d/80-drivers.rules | 12 ++++++++++++ rules/rules.d/80-drivers.rules.in | 12 ------------ 7 files changed, 22 insertions(+), 34 deletions(-) create mode 100644 extras/mtd_probe/75-probe_mtd.rules delete mode 100644 extras/mtd_probe/75-probe_mtd.rules.in delete mode 100644 rules/.gitignore create mode 100644 rules/rules.d/80-drivers.rules delete mode 100644 rules/rules.d/80-drivers.rules.in diff --git a/Makefile.am b/Makefile.am index 0064631e44..3e7996fdd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,17 +145,9 @@ dist_udevrules_DATA = \ rules/rules.d/60-persistent-input.rules \ rules/rules.d/60-persistent-alsa.rules \ rules/rules.d/60-persistent-storage.rules \ + rules/rules.d/80-drivers.rules \ rules/rules.d/95-udev-late.rules -udevrules_DATA = \ - rules/rules.d/80-drivers.rules - -EXTRA_DIST += \ - rules/rules.d/80-drivers.rules.in - -CLEANFILES += \ - rules/rules.d/80-drivers.rules - udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = udev.conf @@ -640,10 +632,8 @@ extras_mtd_probe_mtd_probe_SOURCES = \ extras/mtd_probe/mtd_probe.h \ extras/mtd_probe/probe_smartmedia.c extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) -udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules +dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules libexec_PROGRAMS += extras/mtd_probe/mtd_probe -EXTRA_DIST += extras/mtd_probe/75-probe_mtd.rules.in -CLEANFILES += extras/mtd_probe/75-probe_mtd.rules endif if ENABLE_RULE_GENERATOR diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore index 70d3e8310e..82b8ab501f 100644 --- a/extras/mtd_probe/.gitignore +++ b/extras/mtd_probe/.gitignore @@ -1,2 +1 @@ mtd_probe -75-probe_mtd.rules diff --git a/extras/mtd_probe/75-probe_mtd.rules b/extras/mtd_probe/75-probe_mtd.rules new file mode 100644 index 0000000000..6b0c1c27e6 --- /dev/null +++ b/extras/mtd_probe/75-probe_mtd.rules @@ -0,0 +1,8 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add", GOTO="mtd_probe_end" + +KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $tempnode" +KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl" + +LABEL="mtd_probe_end" diff --git a/extras/mtd_probe/75-probe_mtd.rules.in b/extras/mtd_probe/75-probe_mtd.rules.in deleted file mode 100644 index 6b0c1c27e6..0000000000 --- a/extras/mtd_probe/75-probe_mtd.rules.in +++ /dev/null @@ -1,8 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION!="add", GOTO="mtd_probe_end" - -KERNEL=="mtd*ro", IMPORT{program}="mtd_probe $tempnode" -KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", IMPORT{builtin}="kmod load sm_ftl" - -LABEL="mtd_probe_end" diff --git a/rules/.gitignore b/rules/.gitignore deleted file mode 100644 index 16f9c2daa8..0000000000 --- a/rules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -rules.d/80-drivers.rules diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules new file mode 100644 index 0000000000..38ebfeb0e6 --- /dev/null +++ b/rules/rules.d/80-drivers.rules @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +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", IMPORT{builtin}="kmod load ppdev" + +LABEL="drivers_end" diff --git a/rules/rules.d/80-drivers.rules.in b/rules/rules.d/80-drivers.rules.in deleted file mode 100644 index 38ebfeb0e6..0000000000 --- a/rules/rules.d/80-drivers.rules.in +++ /dev/null @@ -1,12 +0,0 @@ -# do not edit this file, it will be overwritten on update - -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", IMPORT{builtin}="kmod load ppdev" - -LABEL="drivers_end" -- cgit v1.2.3-54-g00ecf