linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [compat-wireless] modprobe -l is legacy compatibility mode and is being removed from some distros
@ 2012-01-24 19:35 Richard Farina
  2012-01-29 21:39 ` Hauke Mehrtens
  2012-01-31 23:14 ` Luis R. Rodriguez
  0 siblings, 2 replies; 8+ messages in thread
From: Richard Farina @ 2012-01-24 19:35 UTC (permalink / raw)
  To: Luis R. Rodriguez, Hauke Mehrtens, wireless

module-init-tools has been deprecated in favor of kmod in Arch Linux, 
and kmod doesn't have the legacy --list option for modprobe.
This patch fixes the areas of the Makefile which actually needed the 
output of modprobe -l. The other 100's of uses are just to echo info to 
the screen which in this case will simply fail in an extremely noisy 
fashion yet non-fatal way.

Please apply to all branches.

Signed-of-By: Rick Farina <sidhayn@gmail.com>

diff -Naur compat-wireless-3.3-rc1-2/Makefile 
compat-wireless-3.3-rc1-2-modinfo-migration/Makefile
--- compat-wireless-3.3-rc1-2/Makefile    2012-01-21 02:00:21.000000000 
-0500
+++ compat-wireless-3.3-rc1-2-modinfo-migration/Makefile    2012-01-24 
14:27:20.000000000 -0500
@@ -9,11 +9,6 @@
  # Sometimes not available in the path
  MODPROBE := /sbin/modprobe

-ifneq ($(wildcard $(MODPROBE)),)
-MADWIFI=$(shell $(MODPROBE) -l ath_pci)
-OLD_IWL=$(shell $(MODPROBE) -l iwl4965)
-endif
-
  DESTDIR?=

  ifneq ($(KERNELRELEASE),)
@@ -188,7 +183,7 @@
      @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:"  ;\
@@ -197,7 +192,7 @@
          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:"  ;\


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-02-04 13:42 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-24 19:35 [compat-wireless] modprobe -l is legacy compatibility mode and is being removed from some distros Richard Farina
2012-01-29 21:39 ` Hauke Mehrtens
2012-01-31 14:04   ` Richard Farina
2012-01-31 23:15     ` Luis R. Rodriguez
2012-02-03  3:46       ` Rusty Russell
2012-02-04 13:44         ` Lucas De Marchi
2012-01-31 23:14 ` Luis R. Rodriguez
2012-02-03  2:50   ` Richard Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).