From 61d9ee9aa74dbfcd85f4d602658ad2c1438d3b84 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 6 Aug 2011 17:07:42 +0000 Subject: [PATCH 1/1] 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 --- package/mac80211/Makefile | 1 + .../mac80211/files/b43-fwcutter-fw-dirname.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 package/mac80211/files/b43-fwcutter-fw-dirname.patch diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index bc556f923..168ede3f2 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 000000000..c2f49ab78 --- /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; + -- 2.20.1