allow targets to define a default subtarget when using automatic subtarget detection...

[openwrt.git] / package / iproute2 / Makefile

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index c7c3e2b..7ffdfc0 100644 (file)
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iproute2

-PKG_VERSION:=2.6.29-1
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.35
+PKG_RELEASE:=3

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://devresources.linux-foundation.org/dev/iproute2/download/

-PKG_MD5SUM:=c1bc258a6c345905e79935ac7a3cc582
+PKG_MD5SUM:=b0f281b3124bf04669e18f5fe16d4934
+PKG_BUILD_PARALLEL:=1

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


@@ -27,9 +28,14 @@ endef
 
 define Package/ip
 $(call Package/iproute2/Default)
 
 define Package/ip
 $(call Package/iproute2/Default)

+  SUBMENU:=Routing and Redirection

   TITLE:=Routing control utility
 endef
 
   TITLE:=Routing control utility
 endef
 

+define Package/ip/conffiles
+/etc/iproute2/rt_tables
+endef
+

 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility
 define Package/tc
 $(call Package/iproute2/Default)
   TITLE:=Traffic control utility


@@ -48,19 +54,25 @@ define Build/Configure
        $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
                $(PKG_BUILD_DIR)/Makefile
        # For now disable compiling of the misc directory because it seems to fail
        $(SED) "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=$(STAGING_DIR)/include," \
                $(PKG_BUILD_DIR)/Makefile
        # For now disable compiling of the misc directory because it seems to fail

-       rm -rf $(PKG_BUILD_DIR)/misc 
+       rm -rf $(PKG_BUILD_DIR)/misc

        $(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile
        $(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile

+       echo "static const char SNAPSHOT[] = \"$(PKG_VERSION)-$(PKG_RELEASE)-openwrt\";" \
+               > $(PKG_BUILD_DIR)/include/SNAPSHOT.h

 endef
 
 MAKE_FLAGS += \
        EXTRA_CCOPTS="$(TARGET_CFLAGS)" \
        KERNEL_INCLUDE="$(LINUX_DIR)/include" \
 endef
 
 MAKE_FLAGS += \
        EXTRA_CCOPTS="$(TARGET_CFLAGS)" \
        KERNEL_INCLUDE="$(LINUX_DIR)/include" \

-       FPIC="$(FPIC)" \
-       all tc/tc ip/ip
+       FPIC="$(FPIC)"

 
 define Build/Compile
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR)/netem HOSTCC="$(HOSTCC)" EXTRA_CCOPTS="$(TARGET_CFLAGS)" CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
-       $(Build/Compile/Default)
+       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/netem \
+               HOSTCC="$(HOSTCC)"  EXTRA_CCOPTS="$(TARGET_CFLAGS)" \
+               CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall \
+               -I../include -DRESOLVE_HOSTNAMES"
+       $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) all
+       $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/tc $(MAKE_FLAGS) tc
+       $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/ip $(MAKE_FLAGS) ip

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -90,5 +102,3 @@ endef
 $(eval $(call BuildPackage,ip))
 $(eval $(call BuildPackage,tc))
 $(eval $(call BuildPackage,genl))
 $(eval $(call BuildPackage,ip))
 $(eval $(call BuildPackage,tc))
 $(eval $(call BuildPackage,genl))

-
-