Fix module, compilation, upgrade to 0.9.3, standardize, 2.4 build is broken, closes...

SVN-Revision: 5143

diff --git a/net/aodv-uu/Makefile b/net/aodv-uu/Makefile
index 4247d94f4fd4a62efc7c224b6568b10a6cc94fa7..8d138dd0f09b8638473d293655ee82a2febe6432 100644 (file)
--- a/net/aodv-uu/Makefile
+++ b/net/aodv-uu/Makefile
@@ -7,15 +7,16 @@
 # $Id: Makefile 4091 2006-06-27 00:35:46Z mbm $
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=aodv-uu
-PKG_VERSION:=0.9.1
+PKG_VERSION:=0.9.3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.comnets.uni-bremen.de/~mua/
-PKG_MD5SUM:=ec23502d63664231f573557ddce38a82
+PKG_SOURCE_URL:=http://core.it.uu.se/core/files/
+PKG_MD5SUM:=05460543054449cb4b170252a7168c65
 PKG_CAT:=zcat
 
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -23,17 +24,37 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 include $(INCLUDE_DIR)/package.mk
 
 define Package/aodv-uu
-SECTION:=base
-CATEGORY:=Network
-TITLE:=Ad-hoc On-demand Distance Vector Routing
-DESCRIPTION:=Ad-hoc On-demand Distance Vector Routing
-URL:=http://core.it.uu.se/adhoc/AodvUUImpl
+  SECTION:=base
+  CATEGORY:=Network
+  TITLE:=Ad-hoc On-demand Distance Vector Routing
+  DESCRIPTION:=\
+       Ad-hoc On-demand Distance Vector Routing
+  URL:=http://core.it.uu.se/adhoc/AodvUUImpl
+endef
+
+define Package/kmod-aodv-uu
+  SECTION:=kernel
+  CATEGORY=Kernel drivers
+  DEPENDS:=@LINUX_2_6
+  TITLE:=kernel module for Ad-hoc On-demand Distance Vector Routing
+  DESCRIPTION:=\
+       Ad-hoc On-demand Distance Vector Routing
+  URL:=http://core.it.uu.se/adhoc/AodvUUImpl
 endef
 
 define Build/Compile
+       $(MAKE) -C $(LINUX_DIR) \
+               ARCH="$(LINUX_KARCH)" \
+               CROSS_COMPILE="$(TARGET_CROSS)" \
+               PATCHLEVEL="$(LINUX_VERSION)" \
+               KERNDIR="$(LINUX_DIR)" \
+               SUBDIRS="$(PKG_BUILD_DIR)/lnx" \
+                modules
        $(call Build/Compile/Default, \
-KERNEL_DIR="$(LINUX_DIR)/" KCC="$(TARGET_CC)" \
-CFLAGS="$(TARGET_CFLAGS)" aodvd)
+               KERNEL_DIR="$(LINUX_DIR)/" \
+               KCC="$(TARGET_CC)" \
+               CFLAGS="$(TARGET_CFLAGS)" aodvd \
+       )
 endef
 
 define Package/aodv-uu/install
@@ -41,4 +62,12 @@ define Package/aodv-uu/install
        install -m0755 $(PKG_BUILD_DIR)/aodvd $(1)/usr/sbin
 endef
 
+define Package/kmod-aodv-uu/install
+       mkdir -p $(1)/etc/modules.d
+       install -m0644 ./files/aodv-uu.modules $(1)/etc/modules.d/80-aodv-uu
+       install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION)
+       $(CP) $(PKG_BUILD_DIR)/lnx/kaodv.$(LINUX_KMOD_SUFFIX) $(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
 $(eval $(call BuildPackage,aodv-uu))
+$(eval $(call BuildPackage,kmod-aodv-uu))

diff --git a/net/aodv-uu/files/aodv-uu.modules b/net/aodv-uu/files/aodv-uu.modules
new file mode 100644 (file)
index 0000000..809c4da
--- /dev/null
+++ b/net/aodv-uu/files/aodv-uu.modules
@@ -0,0 +1 @@
+kaodv