bcm_sta: fix build

'dpkg --print-architecture' is wrong in bcm_sta-002-Makefile.patch
so remove it and pass BINARCH=$ARCH
This commit is contained in:
Stefan Saraev 2013-05-26 22:06:22 +03:00
parent e19c8dfd83
commit 6eadb8b70d
2 changed files with 7 additions and 30 deletions

View File

@ -27,4 +27,4 @@ cd $PKG_BUILD
[ "$TARGET_ARCH" = "i386" ] && cd x86-32
[ "$TARGET_ARCH" = "x86_64" ] && cd x86-64
KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd`
KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$ARCH

View File

@ -1,19 +1,8 @@
diff --git a/x86-32/Makefile b/x86-32/Makefile
index bf30b03..d835350 100644
--- a/x86-32/Makefile
+++ b/x86-32/Makefile
@@ -113,6 +113,12 @@ ifeq ($(APIFINAL),WEXT)
$(info Using Wireless Extension API)
endif
+ifeq ($(shell dpkg --print-architecture),amd64)
+BINARCH = x86_64
+else
+BINARCH = i386
+endif
+
obj-m += wl.o
wl-objs :=
@@ -125,7 +131,7 @@ EXTRA_CFLAGS += -I$(src)/src/include
@@ -125,7 +125,7 @@ EXTRA_CFLAGS += -I$(src)/src/include
EXTRA_CFLAGS += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
#EXTRA_CFLAGS += -DBCMDBG_ASSERT
@ -22,23 +11,11 @@
KBASE ?= /lib/modules/`uname -r`
KBUILD_DIR ?= $(KBASE)/build
diff --git a/x86-64/Makefile b/x86-64/Makefile
index bf30b03..d835350 100644
--- a/x86-64/Makefile
+++ b/x86-64/Makefile
@@ -113,6 +113,12 @@ ifeq ($(APIFINAL),WEXT)
$(info Using Wireless Extension API)
endif
+ifeq ($(shell dpkg --print-architecture),amd64)
+BINARCH = x86_64
+else
+BINARCH = i386
+endif
+
obj-m += wl.o
wl-objs :=
@@ -125,7 +131,7 @@ EXTRA_CFLAGS += -I$(src)/src/include
@@ -125,7 +125,7 @@ EXTRA_CFLAGS += -I$(src)/src/include
EXTRA_CFLAGS += -I$(src)/src/wl/sys -I$(src)/src/wl/clm/api -I$(src)/src/wl/phy
#EXTRA_CFLAGS += -DBCMDBG_ASSERT