X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/df1d9706f4e8dc21c18dd210c16cef8620ca7efe..298693ec7d300de777ce8ba538766114f1b7b90b:/package/iproute2/Makefile

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index e44212906..7354820a0 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -1,33 +1,48 @@
+# 
+# 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
-PKG_VERSION:=2.6.9
+PKG_VERSION:=2.6.25
 PKG_RELEASE:=1
-PKG_MD5SUM:=4b3f335b0139cb909c6a2ae8bf72e548
 
-PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
-PKG_SOURCE:=$(PKG_NAME)-2.6.9-041019.tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-2.6.9
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/
+PKG_MD5SUM:=5737bade2f5e03fad0e2c81da91e551e
 
-PKG_IP:=$(PACKAGE_DIR)/ip_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IP_DIR:=$(PKG_BUILD_DIR)/ipkg/ip
+PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
 
-PKG_TC:=$(PACKAGE_DIR)/tc_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_TC_DIR:=$(PKG_BUILD_DIR)/ipkg/tc
+include $(INCLUDE_DIR)/package.mk
 
-$(DL_DIR)/$(PKG_SOURCE):
-	 $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+define Package/iproute2/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://linux-net.osdl.org/index.php/Iproute2
+endef
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	$(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile
-	touch $(PKG_BUILD_DIR)/.patched
+define Package/ip
+$(call Package/iproute2/Default)
+  TITLE:=Routing control utility
+endef
+
+define Package/tc
+$(call Package/iproute2/Default)
+  TITLE:=Traffic control utility
+endef
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
+define Package/genl
+$(call Package/iproute2/Default)
+  TITLE:=General netlink utility frontend
+endef
+
+define Build/Configure
+	$(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
 		$(PKG_BUILD_DIR)/Makefile
@@ -36,58 +51,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
 	# For now disable compiling of the misc directory because it seems to fail
 	rm -rf $(PKG_BUILD_DIR)/misc 
 	$(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile
-	touch $(PKG_BUILD_DIR)/.configured
-
-$(PKG_BUILD_DIR)/tc/tc: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc
-
-$(PKG_BUILD_DIR)/ip/ip: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all ip/ip
-
-
-$(PKG_IP): $(PKG_BUILD_DIR)/ip/ip $(PACKAGE_DIR)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IP_DIR) ip.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IP_DIR)/usr/sbin
-	cp $< $(PKG_IP_DIR)/usr/sbin/
-	$(STRIP) $(PKG_IP_DIR)/usr/sbin/*
-	$(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/ip.list: $(PKG_IP)
-	$(IPKG) install $(PKG_IP)
-
-$(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_TC_DIR)/usr/sbin
-	cp $< $(PKG_TC_DIR)/usr/sbin/
-	$(STRIP) $(PKG_TC_DIR)/usr/sbin/*
-	$(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/tc.list: $(PKG_TC)
-	$(IPKG) install $(PKG_TC)
-
-$(PACKAGE_DIR):
-	mkdir -p $(PACKAGE_DIR)
-
-TARGETS:=
-ifneq ($(BR2_PACKAGE_IPROUTE2_IP),)
-TARGETS += $(PKG_IP)
-endif
-ifneq ($(BR2_PACKAGE_IPROUTE2_TC),)
-TARGETS += $(PKG_TC)
-endif
-
-ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip.list
-endif
-ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y)
-INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/tc.list
-endif
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(TARGETS)
-install: $(INSTALL_TARGETS)
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IP) $(PKG_TC)
+endef
+
+define Build/Compile
+	$(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
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/iproute2
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/iproute2/rt_tables $(1)/etc/iproute2
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/
+endef
+
+define Package/tc/install
+	$(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))
+$(eval $(call BuildPackage,genl))
+
+$(eval $(call RequireCommand,bison, \
+	$(PKG_NAME) requires GNU bison. \
+))