X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b44ef5439bcc27ba9d19fc81ca1dce1bcc83f65f..e8135790c4e82c08cf18a9802ce2552588c2f51a:/package/crda/Makefile?ds=sidebyside

diff --git a/package/crda/Makefile b/package/crda/Makefile
index e134c39e3..f0170f5c1 100644
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -10,17 +10,17 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=crda
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.1.1
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/crda
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=1f9854a77c7d92671b8bc8a502716a5b
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_MD5SUM:=5fc77af68b3e21736b8ef2f8b061c810
+PKG_BUILD_DEPENDS:=mac80211
 
 PKG_REGULATORY_NAME:=regulatory
-PKG_REGULATORY_VERSION:=2009.04.17
+PKG_REGULATORY_VERSION:=2011.04.28
 PKG_REGULATORY_SOURCE_URL:=http://wireless.kernel.org/download/wireless-regdb/regulatory.bins
 PKG_REGULATORY_SOURCE:=$(PKG_REGULATORY_VERSION)-$(PKG_REGULATORY_NAME).bin
-PKG_REGULATORY_MD5SUM:=2d7d99b79062b8f2edfbd72222fdfe08
+PKG_REGULATORY_MD5SUM:=1535e98bcaba732e2f8e8f62dac6f369
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +28,7 @@ define Package/crda
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Central Regulatory Domain Agent (CRDA)
-  DEPENDS:=@LINUX_2_6 +hotplug2 +kmod-mac80211
+  DEPENDS:=+libnl-tiny
   URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA
 endef
 
@@ -49,14 +49,17 @@ define Package/crda/description
  yet to be added).
 endef
 
-define Build/Compile
-	$(MAKE_VARS) \
-	$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
-		$(MAKE_FLAGS) \
-		NLLIBS="$(STAGING_DIR)/usr/lib/libnl.a -lm" \
-		REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \
-		crda
-endef
+TARGET_CPPFLAGS := \
+	-I$(STAGING_DIR)/usr/include/libnl-tiny \
+	-D_GNU_SOURCE \
+	$(TARGET_CPPFLAGS)
+
+MAKE_FLAGS += \
+	NL1FOUND="" NL2FOUND=Y \
+	NLLIBNAME="libnl-tiny" \
+	NLLIBS="-lnl-tiny -lm" \
+	REG_BIN="$(DL_DIR)/$(PKG_REGULATORY_SOURCE)" \
+	crda
 
 define Package/crda/install
 	$(INSTALL_DIR) $(1)/sbin