modprobe -l is either deprecated or removed, so let's replace it
Signed-off-by: Rick Farina <[email protected]>
---
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
On 02/23/12 20:39, Luis R. Rodriguez wrote:
> On Sun, Feb 19, 2012 at 8:03 AM, Rick Farina <[email protected]> wrote:
>> modprobe -l is either deprecated or removed, so let's replace it
>>
>> Signed-off-by: Rick Farina <[email protected]>
> Did you test this when one of those modules is present?
ozzie compat-wireless # $(modinfo compat > /dev/null 2>&1) && echo yes
yes
ozzie compat-wireless #
The logic is sound, I use the same test in another script and it works
great. It's a bit unusual I realize, but it works and it's all I could
think of. It tests the exit value of modinfo which is true when the
module exists and false when it doesn't. Simple as I could manage.
-Rick
>
> Luis
>
On Sun, Feb 19, 2012 at 8:03 AM, Rick Farina <[email protected]> wrote:
> modprobe -l is either deprecated or removed, so let's replace it
>
> Signed-off-by: Rick Farina <[email protected]>
Did you test this when one of those modules is present?
Luis