aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-08-06 17:07:42 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-08-06 17:07:42 +0000
commitd91d639a8722c8b7d608b00edf06641b30b4bc4a (patch)
tree055c99ddb7063709b774c9a93a855cc269e4ca52 /package
parent6dfe437155ce8a66942ec13f027ac9122aab9ff3 (diff)
downloadupstream-d91d639a8722c8b7d608b00edf06641b30b4bc4a.tar.gz
upstream-d91d639a8722c8b7d608b00edf06641b30b4bc4a.tar.bz2
upstream-d91d639a8722c8b7d608b00edf06641b30b4bc4a.zip
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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27926 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/Makefile1
-rw-r--r--package/mac80211/files/b43-fwcutter-fw-dirname.patch16
2 files changed, 17 insertions, 0 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index bc556f9230..168ede3f22 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 0000000000..c2f49ab781
--- /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;
+