If you're cross-compiling compat-wireless on a different host, you
can't reliably use modprobe. The host system may not even have
modprobe, so it doesn't make sense to run modprobe, unless you're
installing the modules on the target machine.
The modprobe command was being used unconditionally to set the MADWIFI
and OLD_IWL variables. This commit adds a check to see whether
modprobe exists before trying to use. It also adds a dependency on
the modprobe commands to all recipes that rely on it, so we fail more
gracefully if modprobe doesn't exist in the system.
Reported by: William List <[email protected]>
Signed-off-by: Luciano Coelho <[email protected]>
---
Makefile | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index c81d680..e3d9128 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,11 @@ 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)
+endif
DESTDIR?=
@@ -95,7 +98,7 @@ $(CREL_CHECK):
btinstall: btuninstall bt-install-modules
-bt-install-modules: bt
+bt-install-modules: bt $(MODPROBE)
$(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) BT=TRUE \
modules_install
@/sbin/depmod -ae
@@ -130,7 +133,7 @@ bt-install-modules: bt
@echo And then load the needed bluetooth modules. If unsure reboot.
@echo
-btuninstall:
+btuninstall: $(MODPROBE)
@# New location, matches upstream
@rm -rf $(KLIB)/$(KMODDIR)/net/bluetooth/
@rm -rf $(KLIB)/$(KMODDIR)/drivers/bluetooth/
@@ -173,7 +176,7 @@ install-modules: modules
modules_install
@./scripts/update-initramfs
-install-scripts:
+install-scripts: $(MODPROBE)
@# All the scripts we can use
@mkdir -p $(DESTDIR)/usr/lib/compat-wireless/
@install scripts/modlib.sh $(DESTDIR)/usr/lib/compat-wireless/
@@ -330,7 +333,7 @@ install-scripts:
@echo If unsure reboot.
@echo
-uninstall:
+uninstall: $(MODPROBE)
@# New location, matches upstream
@rm -rf $(KLIB)/$(KMODDIR)/compat/
@rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/
--
1.7.4.1
On Wed, 2012-01-18 at 09:15 -0800, Luis R. Rodriguez wrote:
> On Wed, Jan 18, 2012 at 12:13 AM, Luciano Coelho <[email protected]> wrote:
> > If you're cross-compiling compat-wireless on a different host, you
> > can't reliably use modprobe. The host system may not even have
> > modprobe, so it doesn't make sense to run modprobe, unless you're
> > installing the modules on the target machine.
> >
> > The modprobe command was being used unconditionally to set the MADWIFI
> > and OLD_IWL variables. This commit adds a check to see whether
> > modprobe exists before trying to use. It also adds a dependency on
> > the modprobe commands to all recipes that rely on it, so we fail more
> > gracefully if modprobe doesn't exist in the system.
> >
> > Reported by: William List <[email protected]>
> > Signed-off-by: Luciano Coelho <[email protected]>
>
> Good point, I've propagated this into the linux-3.2.y and linux-3.1.y
> branches of compat-wireless as well so that if a new release is made
> the fixes go along with it.
Excellent, thanks dude!
--
Cheers,
Luca.
On Wed, Jan 18, 2012 at 12:13 AM, Luciano Coelho <[email protected]> wrote:
> If you're cross-compiling compat-wireless on a different host, you
> can't reliably use modprobe. The host system may not even have
> modprobe, so it doesn't make sense to run modprobe, unless you're
> installing the modules on the target machine.
>
> The modprobe command was being used unconditionally to set the MADWIFI
> and OLD_IWL variables. This commit adds a check to see whether
> modprobe exists before trying to use. It also adds a dependency on
> the modprobe commands to all recipes that rely on it, so we fail more
> gracefully if modprobe doesn't exist in the system.
>
> Reported by: William List <[email protected]>
> Signed-off-by: Luciano Coelho <[email protected]>
Good point, I've propagated this into the linux-3.2.y and linux-3.1.y
branches of compat-wireless as well so that if a new release is made
the fixes go along with it.
Luis