X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibertas%2FMakefile;h=1641abeeb656e381e5c6992ed2c680c7a43ce3c0;hb=37c404bc410707b136f70d8675b1a9629224bd7a;hp=bf8cbbc69ed76413804e27477f1d2f494b2b4b23;hpb=7a4bdab85080df3e4a39ed3cf6d7e5ee325a26d2;p=openwrt-10.03%2F.git

diff --git a/package/libertas/Makefile b/package/libertas/Makefile
index bf8cbbc69..1641abeeb 100644
--- a/package/libertas/Makefile
+++ b/package/libertas/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007 - 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -14,9 +14,10 @@ PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
+# XXX: current version needs 'get_unaligned_le16' helper introduced in 2.6.26
 define KernelPackage/libertas
   SUBMENU:=Other modules
-  DEPENDS:=@TARGET_olpc +kmod-ieee80211
+  DEPENDS:=+kmod-ieee80211 @LINUX_2_6_26 @LINUX_2_6_27 @LINUX_2_6_28
   TITLE:=Marvell 88W8015 Wireless Driver
   FILES:= \
 	$(PKG_BUILD_DIR)/libertas.$(LINUX_KMOD_SUFFIX)  \
@@ -25,14 +26,16 @@ define KernelPackage/libertas
 endef
 
 define Download/firmware
-  URL:=http://dev.laptop.org/pub/firmware/libertas
-  FILE:=usb8388-5.220.11.p5.bin
-  MD5SUM=37cc814d5a475fcf8f8fbe89a9c5d546
+  URL:=http://dev.laptop.org/pub/firmware/libertas/
+  FILE:=usb8388-5.110.22.p20.bin
+  #MD5SUM=37cc814d5a475fcf8f8fbe89a9c5d546
 endef
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	$(Build/Patch)
+	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
 endef
 
 define Build/Compile
@@ -42,13 +45,13 @@ define Build/Compile
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		CONFIG_LIBERTAS=m \
 		CONFIG_LIBERTAS_USB=m \
-		EXTRA_CFLAGS="-I$(PKG_BUILD_DIR) -include compat.h -I$(STAGING_DIR)/usr/include/mac80211" \
+		EXTRA_CFLAGS="-I$(PKG_BUILD_DIR) -DCONFIG_LIBERTAS_DEBUG -I$(STAGING_DIR)/usr/include/mac80211" \
 		modules 
 endef
 
 define KernelPackage/libertas/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_BIN) $(DL_DIR)/usb8388-5.220.11.p5.bin $(1)/lib/firmware/usb8388.bin
+	$(INSTALL_BIN) $(DL_DIR)/usb8388-5.110.22.p20.bin $(1)/lib/firmware/usb8388.bin
 	$(INSTALL_DATA) ./files/LICENSE $(1)/lib/firmware/
 endef