modprobe -l is either deprecated or removed, so let's replace it Signed-off-by: Rick Farina <sidhayn@xxxxxxxxx> --- Makefile | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 4149d8d..0403a34 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,6 @@ else export KLIB:= /lib/modules/$(shell uname -r) endif export KLIB_BUILD ?= $(KLIB)/build -# Sometimes not available in the path -MODPROBE := /sbin/modprobe - -ifneq ($(wildcard $(MODPROBE)),) -MADWIFI=$(shell $(MODPROBE) -l ath_pci) -OLD_IWL=$(shell $(MODPROBE) -l iwl4965) -OLD_ALX=$(shell $(MODPROBE) -l atl1c) -endif DESTDIR?= @@ -99,7 +91,7 @@ $(CREL_CHECK): btinstall: btuninstall bt-install-modules -bt-install-modules: bt $(MODPROBE) +bt-install-modules: bt $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) BT=TRUE \ modules_install @/sbin/depmod -ae @@ -111,7 +103,7 @@ bt-install-modules: bt $(MODPROBE) @echo And then load the needed bluetooth modules. If unsure reboot. @echo -btuninstall: $(MODPROBE) +btuninstall: @# New location, matches upstream @rm -rf $(KLIB)/$(KMODDIR)/net/bluetooth/ @rm -rf $(KLIB)/$(KMODDIR)/drivers/bluetooth/ @@ -131,7 +123,7 @@ install-modules: modules modules_install @./scripts/update-initramfs -install-scripts: $(MODPROBE) +install-scripts: @# All the scripts we can use @mkdir -p $(DESTDIR)/usr/lib/compat-wireless/ @install scripts/modlib.sh $(DESTDIR)/usr/lib/compat-wireless/ @@ -144,7 +136,7 @@ install-scripts: $(MODPROBE) @install scripts/athload $(DESTDIR)/usr/sbin/ @install scripts/b43load $(DESTDIR)/usr/sbin/ @install scripts/iwl-load $(DESTDIR)/usr/sbin/ - @if [ ! -z "$(MADWIFI)" ] && [ -z "$(DESTDIR)" ]; then \ + @if $(modinfo ath_pci > /dev/null 2>&1) && [ -z "$(DESTDIR)" ]; then \ echo ;\ echo -n "Note: madwifi detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ @@ -153,7 +145,7 @@ install-scripts: $(MODPROBE) echo Running athenable ath5k...;\ /usr/sbin/athenable ath5k ;\ fi - @if [ ! -z "$(OLD_IWL)" ] && [ -z "$(DESTDIR)" ]; then \ + @if $(modinfo iwl4965 > /dev/null 2>&1) && [ -z "$(DESTDIR)" ]; then \ echo ;\ echo -n "Note: iwl4965 detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ @@ -162,7 +154,7 @@ install-scripts: $(MODPROBE) echo Running iwl-enable iwlagn...;\ /usr/sbin/iwl-enable iwlagn ;\ fi - @if [ ! -z "$(OLD_ALX)" ] && [ -z "$(DESTDIR)" ]; then \ + @if $(modinfo atl1c > /dev/null 2>&1) && [ -z "$(DESTDIR)" ]; then \ echo ;\ echo -n "Note: atl1c detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ @@ -195,7 +187,7 @@ install-scripts: $(MODPROBE) @echo If unsure reboot. @echo -uninstall: $(MODPROBE) +uninstall: @# New location, matches upstream @rm -rf $(KLIB)/$(KMODDIR)/compat/ @rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/ -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
