linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Farina <sidhayn@gmail.com>
To: "Luis R. Rodriguez" <mcgrof@gmail.com>,
	Hauke Mehrtens <hauke@hauke-m.de>,
	wireless <linux-wireless@vger.kernel.org>
Subject: [compat-wireless] modprobe -l is legacy compatibility mode and is being removed from some distros
Date: Tue, 24 Jan 2012 14:35:44 -0500	[thread overview]
Message-ID: <4F1F0810.2000306@gmail.com> (raw)

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:"  ;\


             reply	other threads:[~2012-01-24 19:36 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-24 19:35 Richard Farina [this message]
2012-01-29 21:39 ` [compat-wireless] modprobe -l is legacy compatibility mode and is being removed from some distros 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F1F0810.2000306@gmail.com \
    --to=sidhayn@gmail.com \
    --cc=hauke@hauke-m.de \
    --cc=linux-wireless@vger.kernel.org \
    --cc=mcgrof@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).