From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bryan Kadzban <bryan@kadzban.is-a-geek.net>
Date: Mon, 30 Jan 2012 03:10:52 +0000
Subject: [PATCH] Fix default firmware search paths
Message-Id: <4F260A3C.6090309@kadzban.is-a-geek.net>
MIME-Version: 1
Content-Type: multipart/mixed; boundary="------------060700080105040706030107"
List-Id: <linux-hotplug.vger.kernel.org>
To: linux-hotplug@vger.kernel.org

This is a multi-part message in MIME format.
--------------060700080105040706030107
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

"./configure --help" says the default firmware search path
(--with-firmware-path) is /lib/firmware/updates:/lib/firmware.  But the
actual default is:

[with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"]

and $rootprefix defaults to $ac_default_prefix, which is /usr, not the
empty string.

Fix this by changing the default with_firmware_path to explicitly match
the directories the kernel uses to install firmware.

(An alternative fix would be to change the help string for
--with-firmware-path to mention ${rootprefix}, although I think it'd be
a good idea to mention that flag's default of /usr as well, if this is
done.)

Signed-Off-By: Bryan Kadzban <bryan@kadzban.is-a-geek.net>

--------------060700080105040706030107
Content-Type: text/plain;
 name="udev-fix-firmware-search-paths.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="udev-fix-firmware-search-paths.patch"

diff --git a/configure.ac b/configure.ac
index 9772d82..51dd7dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ AS_IF([test "x$enable_logging" = "xyes"], [ AC_DEFINE(ENABLE_LOGGING, [1], [Syst
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
           [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
-       [], [with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"])
+       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path; do

--------------060700080105040706030107--