All of lore.kernel.org
 help / color / mirror / Atom feed
From: linux@audioscience.com
To: patch@alsa-project.org
Cc: tiwai@suse.de,
	Eliot Blennerhassett <eblennerhassett@audioscience.com>,
	alsa-devel@alsa-project.org
Subject: [PATCH] Prefer kernel-versioned firmware directory.
Date: Wed, 17 Aug 2011 15:19:23 +1200	[thread overview]
Message-ID: <1313551163-819-1-git-send-email-linux@audioscience.com> (raw)

From: Eliot Blennerhassett <eblennerhassett@audioscience.com>

Different kernel versions may have different driver versions installed,
which in turn require different firmware versions.

If /lib/firmware/$(uname -r) exists, use it in preference to the
generic /lib/firmware.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
 configure.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index c278987..ac9ee52 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,9 @@ AM_CONDITIONAL(BUILD_FW, test "$buildfw" = "yes")
 AC_MSG_CHECKING(firmware installation directory)
 # where to put the firmware. If none of these is right, can specify where
 # --with-hotplug-dir
-if test -d /lib/firmware ; then
+if test -d /lib/firmware/$(uname -r) ; then
+	detected_fwdir="/lib/firmware/$(uname -r)"
+elif test -d /lib/firmware ; then
 	detected_fwdir="/lib/firmware"
 elif test -d /lib/hotplug/firmware ; then
 	detected_fwdir="/lib/hotplug/firmware"
-- 
1.7.0.4

             reply	other threads:[~2011-08-17  3:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-17  3:19 linux [this message]
2011-08-18 10:12 ` [PATCH] Prefer kernel-versioned firmware directory Takashi Iwai
2011-08-18 21:57   ` Eliot Blennerhassett
2011-08-19  5:29     ` Takashi Iwai

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=1313551163-819-1-git-send-email-linux@audioscience.com \
    --to=linux@audioscience.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=eblennerhassett@audioscience.com \
    --cc=patch@alsa-project.org \
    --cc=tiwai@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.