diff options
| author | Jonathan Liu <net147@gmail.com> | 2013-07-18 16:43:45 +1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-24 11:35:33 +0100 |
| commit | 248bb31045b9cbe02680f42612a478b32c7c46b7 (patch) | |
| tree | caabe3075a499618a85bf58d5899bfdddc6ccc84 /meta/recipes-core | |
| parent | 784d7b77294ae8066ff0ac91f7fc90f9795d2bd7 (diff) | |
| download | poky-248bb31045b9cbe02680f42612a478b32c7c46b7.tar.gz | |
systemd: remove unneeded modprobe.rules
systemd already handles loading kernel modules for new hardware.
This also allows blacklisting modules to work properly when creating
a .conf file in /etc/modprobe.d containing "blacklist module_name".
(From OE-Core rev: c7ca6dec31de4321313e56753d056c9df115bd96)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/modprobe.rules | 17 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_204.bb | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/meta/recipes-core/systemd/systemd/modprobe.rules b/meta/recipes-core/systemd/systemd/modprobe.rules deleted file mode 100644 index d4a096b82b..0000000000 --- a/meta/recipes-core/systemd/systemd/modprobe.rules +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | # There are a number of modifiers that are allowed to be used in some | ||
| 2 | # of the different fields. They provide the following subsitutions: | ||
| 3 | # | ||
| 4 | # %n the "kernel number" of the device. | ||
| 5 | # For example, 'sda3' has a "kernel number" of '3' | ||
| 6 | # %e the smallest number for that name which does not matches an existing node | ||
| 7 | # %k the kernel name for the device | ||
| 8 | # %M the kernel major number for the device | ||
| 9 | # %m the kernel minor number for the device | ||
| 10 | # %b the bus id for the device | ||
| 11 | # %c the string returned by the PROGRAM | ||
| 12 | # %s{filename} the content of a sysfs attribute | ||
| 13 | # %% the '%' char itself | ||
| 14 | # | ||
| 15 | |||
| 16 | # Try and modprobe for drivers for new hardware | ||
| 17 | ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" | ||
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb index b8b1290940..62613673a9 100644 --- a/meta/recipes-core/systemd/systemd_204.bb +++ b/meta/recipes-core/systemd/systemd_204.bb | |||
| @@ -19,7 +19,6 @@ inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-altern | |||
| 19 | 19 | ||
| 20 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ | 20 | SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ |
| 21 | file://touchscreen.rules \ | 21 | file://touchscreen.rules \ |
| 22 | file://modprobe.rules \ | ||
| 23 | ${UCLIBCPATCHES} \ | 22 | ${UCLIBCPATCHES} \ |
| 24 | file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \ | 23 | file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \ |
| 25 | file://install-quotaon-once.patch \ | 24 | file://install-quotaon-once.patch \ |
