From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 6 Aug 2011 17:07:42 +0000 (+0000)
Subject: mac80211: always store broadcom firmware in b43 and b43legacy dir
X-Git-Tag: reboot~16080
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6474dbe86b78062fa5858ab55c3a28de42147a8f;p=openwrt%2Fstaging%2Fblogic.git

mac80211: always store broadcom firmware in b43 and b43legacy dir

This is always used to build a firmware for linux systems also if we are on freebsd.

This is one patch from #9897

SVN-Revision: 27926
---

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index bc556f92308e..168ede3f22ea 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -1386,6 +1386,7 @@ endef
 
 define Build/b43-common
 	tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)"
+	patch -p1 -d  "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" < ./files/b43-fwcutter-fw-dirname.patch
 	$(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \
 		CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h" \
 		QUIET_SPARSE=:
diff --git a/package/mac80211/files/b43-fwcutter-fw-dirname.patch b/package/mac80211/files/b43-fwcutter-fw-dirname.patch
new file mode 100644
index 000000000000..c2f49ab7812c
--- /dev/null
+++ b/package/mac80211/files/b43-fwcutter-fw-dirname.patch
@@ -0,0 +1,16 @@
+--- a/fwcutter.c
++++ b/fwcutter.c
+@@ -48,13 +48,8 @@
+ #include "fwcutter.h"
+ #include "fwcutter_list.h"
+ 
+-#if defined(__DragonFly__) || defined(__FreeBSD__)
+-#define V3_FW_DIRNAME	"v3"
+-#define V4_FW_DIRNAME	"v4"
+-#else
+ #define V3_FW_DIRNAME	"b43legacy"
+ #define V4_FW_DIRNAME	"b43"
+-#endif
+ 
+ static struct cmdline_args cmdargs;
+