[package] e2fsprogs: restore patch from [12355], lost between upgrade & downgrade

[openwrt.git] / package / crda / Makefile

diff --git a/package/crda/Makefile b/package/crda/Makefile
index 97a9353..402bee5 100644 (file)
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -9,18 +9,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=crda
-PKG_RELEASE:=1
-PKG_VERSION:=1.0.1
+PKG_RELEASE:=2
+PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://wireless.kernel.org/download/crda
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=03554b71eef2626795befa17eb1d8b9e
-PKG_BUILD_DEPENDS:=mac80211 libnl
+PKG_MD5SUM:=6004584d2e39e899f7642b141dd72028
+PKG_BUILD_DEPENDS:=mac80211
 
 PKG_REGULATORY_NAME:=regulatory
-PKG_REGULATORY_VERSION:=2009.03.09
+PKG_REGULATORY_VERSION:=2009.11.25
 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:=8bda8022441a19e8b956dd3835cf9b10
+PKG_REGULATORY_MD5SUM:=873b5c55a26c8ba7674e083f51cb10aa
 
 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:=@LINUX_2_6 +hotplug2 +kmod-mac80211 +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