summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-30 14:53:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-30 14:53:01 +0000
commit9ae811d9a0d343d9ea66a8ad4c3666f0d9efdb51 (patch)
tree4d63a7e9ee333067eb992d713369c36a3b757de9
parent7939188db6ff1d963f87f127ab4327fe22e02f40 (diff)
crda: use libnl-tiny
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15516 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/crda/Makefile22
1 files changed, 12 insertions, 10 deletions
diff --git a/package/crda/Makefile b/package/crda/Makefile
index e134c39e3..658511705 100644
--- a/package/crda/Makefile
+++ b/package/crda/Makefile
@@ -14,7 +14,7 @@ PKG_VERSION:=1.0.2
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_BUILD_DEPENDS:=mac80211
PKG_REGULATORY_NAME:=regulatory
PKG_REGULATORY_VERSION:=2009.04.17
@@ -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,16 @@ 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 \
+ $(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