aboutsummaryrefslogtreecommitdiffstats
path: root/tools/b43-tools
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-07-02 20:52:50 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-07-02 20:52:50 +0000
commitfbd1aa64c4656fe004150456b922a0c35d757b8c (patch)
treea13f560f58c2983076015e3175a50e7c4b4573b4 /tools/b43-tools
parent8ef67937f1ec48298d48f8abc120bf513c691a99 (diff)
downloadupstream-fbd1aa64c4656fe004150456b922a0c35d757b8c.tar.gz
upstream-fbd1aa64c4656fe004150456b922a0c35d757b8c.tar.bz2
upstream-fbd1aa64c4656fe004150456b922a0c35d757b8c.zip
b43-tools: update to version 019
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41484 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/b43-tools')
-rw-r--r--tools/b43-tools/Makefile6
-rw-r--r--tools/b43-tools/patches/001-fw-dirname.patch2
-rw-r--r--tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch27
3 files changed, 4 insertions, 31 deletions
diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile
index e25bfc23c6..28a33d6a55 100644
--- a/tools/b43-tools/Makefile
+++ b/tools/b43-tools/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=b43-tools
-PKG_VERSION:=017
+PKG_VERSION:=019
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=git://git.bues.ch/b43-tools.git
+PKG_SOURCE_URL:=https://github.com/mbuesch/b43-tools.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_SOURCE_VERSION:=691cd291afdb3dbfcf6b9624f8f4bd068af153d0
+PKG_SOURCE_VERSION:=8dce53297966b31b6c70a7a03c2433978dd9f288
#PKG_MIRROR_MD5SUM:=50ca3c763ee21ee213addd17cf1c1b86
HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME)
diff --git a/tools/b43-tools/patches/001-fw-dirname.patch b/tools/b43-tools/patches/001-fw-dirname.patch
index e9bd03249f..1fd4c66323 100644
--- a/tools/b43-tools/patches/001-fw-dirname.patch
+++ b/tools/b43-tools/patches/001-fw-dirname.patch
@@ -1,6 +1,6 @@
--- a/fwcutter/fwcutter.c
+++ b/fwcutter/fwcutter.c
-@@ -48,13 +48,8 @@
+@@ -50,13 +50,8 @@
#include "fwcutter.h"
#include "fwcutter_list.h"
diff --git a/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch b/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch
deleted file mode 100644
index fc0553d6be..0000000000
--- a/tools/b43-tools/patches/100-b43-asm-fix-compile-error-undefined-reference-to-yyd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/assembler/Makefile
-+++ b/assembler/Makefile
-@@ -30,7 +30,7 @@ BIN = b43-asm.bin
- SRCS = parser.c scanner.c main.c initvals.c util.c args.c
-
- # YACC related CFLAGS
--CFLAGS += -DYYSTYPE="void *" -DYYERROR_VERBOSE -DYYDEBUG -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Wno-unused
-+CFLAGS += -DYYSTYPE="void *" -DYYERROR_VERBOSE -DYYDEBUG=1 -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Wno-unused
-
- .SUFFIXES:
- .PHONY: all install clean distclean
-diff --git a/assembler/main.c b/assembler/main.c
-index afca996..a62a15e 100644
---- a/assembler/main.c
-+++ b/assembler/main.c
-@@ -1260,7 +1260,7 @@ static void initialize(void)
- {
- INIT_LIST_HEAD(&infile.sl);
- INIT_LIST_HEAD(&infile.ivals);
--#ifdef YYDEBUG
-+#if YYDEBUG
- if (IS_INSANE_DEBUG)
- yydebug = 1;
- else
---
-1.7.10.4
-