oops. forgot one file

[openwrt.git] / package / iproute2 / Makefile

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index bbbcc75..8828194 100644 (file)
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -1,29 +1,43 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2

-PKG_VERSION:=2.6.15-060110
+PKG_VERSION:=2.6.20-070313

 PKG_RELEASE:=1
 
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/

-PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
-PKG_CAT:=zcat
+PKG_MD5SUM:=7bc5883aadf740761fa2dd70b661e8cc
+PKG_BUILD_DIR:=$(BUILD_DIR)/iproute-$(PKG_VERSION)

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/iproute2/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://linux-net.osdl.org/index.php/Iproute2
+endef
+

 define Package/ip
 define Package/ip

-SECTION:=base
-CATEGORY:=Network
-DEPENDS:=iproute2
-TITLE:=A routing control utility
+  $(call Package/iproute2/Default)
+  TITLE:=Routing control utility

 endef
 
 define Package/tc
 endef
 
 define Package/tc

-$(call Package/ip)
-TITLE:=A traffic control utility
+  $(call Package/iproute2/Default)
+  TITLE:=Traffic control utility
+endef
+
+define Package/genl
+  $(call Package/iproute2/Default)
+  TITLE:=General netlink utility frontend

 endef
 
 define Build/Configure
 endef
 
 define Build/Configure


@@ -39,19 +53,29 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -j1 -C $(PKG_BUILD_DIR)/netem HOSTCC=$(HOSTCC) CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
-       $(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
+       $(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
+       $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip

 endef
 
 define Package/ip/install
 endef
 
 define Package/ip/install

-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/

 endef
 
 define Package/tc/install
 endef
 
 define Package/tc/install

-       install -d -m0755 $(1)/usr/sbin
-       install -m0755 $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/
+endef
+
+define Package/genl/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/

 endef
 
 $(eval $(call BuildPackage,ip))
 $(eval $(call BuildPackage,tc))
 endef
 
 $(eval $(call BuildPackage,ip))
 $(eval $(call BuildPackage,tc))

+$(eval $(call BuildPackage,genl))
+
+$(eval $(call RequireCommand,bison, \
+       $(PKG_NAME) requires GNU bison. \
+))