diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-03-18 15:12:18 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-03-18 15:19:51 +0100 |
| commit | a3bd8447be4ea2ce230eb8ae0e815c04d85fa15a (patch) | |
| tree | b414aae2a92fe31fc9cc78fab28814c688a64e9f /Makefile.am | |
| parent | 72c6cf8fa586a08b56a1b5d7ed6d7c7272dff3f4 (diff) | |
udev: make firmware loading optional and disable by default
Distros that whish to support old kernels should set
--with-firmware-dirs="/usr/lib/firmware/updates:/usr/lib/firmware"
to retain the old behaviour.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7e9cdfdb26..37eeb01d58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1352,12 +1352,10 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-modules-load.service + SYSINIT_TARGET_WANTS += \ systemd-modules-load.service -dist_udevrules_DATA += \ - rules/80-drivers.rules - endif EXTRA_DIST += \ @@ -1809,7 +1807,6 @@ libudev_core_la_SOURCES = \ src/udev/udev-ctrl.c \ src/udev/udev-builtin.c \ src/udev/udev-builtin-btrfs.c \ - src/udev/udev-builtin-firmware.c \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-net_id.c \ @@ -1833,9 +1830,20 @@ libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" +if ENABLE_FIRMWARE +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-firmware.c + +dist_udevrules_DATA += \ + rules/50-firmware.rules +endif + if HAVE_KMOD libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c + +dist_udevrules_DATA += \ + rules/80-drivers.rules endif if HAVE_BLKID |