[Lunar-commits] <moonbase-core> Merge pull request #18 from Ratler/firmware_fix

[Auke Kok]

commit 4ed825f1246b43214a793ef85cfee5de0c355a28
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Sat, 14 Jul 2012 13:34:30 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/4ed825f1246b43214a793ef85cfee5de0c355a28

Merge pull request #18 from Ratler/firmware_fix

kernel: Stop kernel from installing conflicting firmware
---
  kernel/linux/BUILD                                           +3/-0     
  kernel/linux/DEPENDS                                         +1/-0     
  2 files changed, 0 insertions (+), 0 deletions (-)

--- a/kernel/linux/BUILD
+++ b/kernel/linux/BUILD
@@ -1,5 +1,8 @@
 (
 
+  # Do not install firmware on modules_install
+  sedit '/Makefile.*__fw_modinst/d' Makefile
+
 # Needed for x86_64
   MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
 
--- a/kernel/linux/DEPENDS
+++ b/kernel/linux/DEPENDS
@@ -1,2 +1,3 @@
 depends  autoconf
 depends  %KMOD
+depends  linux-firmware