iproute: bump version and convert to gentargets

Convert iproute2 to gentargets and bump to version 2.6.35.

[Peter: Small fixes to uninstall]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Gustavo Zacarias 2010-09-23 09:53:23 -03:00 committed by Peter Korsgaard
parent 0b5fe8cbe7
commit 8e07b26e06
3 changed files with 33 additions and 51 deletions

View File

@ -20,7 +20,7 @@
Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind, Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,
bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear, bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,
e2fsprogs, expat, freetype, gawk, gvfs, haserl, hostapd, e2fsprogs, expat, freetype, gawk, gvfs, haserl, hostapd,
ifplugd, iptables, jpeg, kexec, kismet, less, libcurl, ifplugd, iproute2, iptables, jpeg, kexec, kismet, less, libcurl,
libdnet, libevent, libglade, libgtk2, libiconv, libidn, libdnet, libevent, libglade, libgtk2, libiconv, libidn,
libmms, libnl, liboil, libpcap, libpng, libungif, libxml2, libmms, libnl, liboil, libpcap, libpng, libungif, libxml2,
libxslt, lighttpd, lite, m4, mdadm, metacity, mtd-utils, libxslt, lighttpd, lite, m4, mdadm, metacity, mtd-utils,

View File

@ -5,7 +5,7 @@ config BR2_PACKAGE_IPROUTE2
Kernel routing and traffic control utilities. Provides things Kernel routing and traffic control utilities. Provides things
like ip and tc. like ip and tc.
http://developer.osdl.org/dev/iproute2/ http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
comment "iproute2 requires a toolchain with IPv6 support" comment "iproute2 requires a toolchain with IPv6 support"
depends on !BR2_INET_IPV6 depends on !BR2_INET_IPV6

View File

@ -3,58 +3,40 @@
# iproute2 # iproute2
# #
############################################################# #############################################################
IPROUTE2_VERSION:=2.6.28
IPROUTE2_SOURCE:=iproute2-$(IPROUTE2_VERSION).tar.bz2
IPROUTE2_SITE:=http://developer.osdl.org/dev/iproute2/download/
IPROUTE2_DIR:=$(BUILD_DIR)/iproute2-$(IPROUTE2_VERSION)
IPROUTE2_CAT:=$(BZCAT)
IPROUTE2_BINARY:=tc/tc
IPROUTE2_TARGET_BINARY:=sbin/tc
$(DL_DIR)/$(IPROUTE2_SOURCE): IPROUTE2_VERSION = 2.6.35
$(call DOWNLOAD,$(IPROUTE2_SITE),$(IPROUTE2_SOURCE)) IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE) define IPROUTE2_CONFIGURE_CMDS
# Use kernel headers
rm -r $(IPROUTE2_DIR)/include/netinet
# arpd needs berkeleydb
$(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(IPROUTE2_DIR)/Makefile
( cd $(@D); ./configure )
echo "IPT_LIB_DIR=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config
endef
$(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE) define IPROUTE2_BUILD_CMDS
$(IPROUTE2_CAT) $(DL_DIR)/$(IPROUTE2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(MAKE) CC="$(TARGET_CC)" -C $(@D)
touch $@ endef
$(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked define IPROUTE2_INSTALL_TARGET_CMDS
(cd $(IPROUTE2_DIR); \ $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" SBINDIR=/sbin \
./configure; \ DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \
$(SED) '/TC_CONFIG_ATM/s:=.*:=n:' Config; \ MANDIR=/usr/share/man install
$(SED) '/^CCOPTS/s:-O2.*:$(TARGET_CFLAGS):' Makefile) # Wants bash
touch $@ rm -f $(TARGET_DIR)/sbin/ifcfg
endef
$(IPROUTE2_DIR)/$(IPROUTE2_BINARY): $(IPROUTE2_DIR)/.configured define IPROUTE2_UNINSTALL_TARGET_CMDS
$(MAKE) \ rm -rf $(TARGET_DIR)/lib/tc
-C $(IPROUTE2_DIR) \ rm -rf $(TARGET_DIR)/usr/lib/tc
KERNEL_INCLUDE=$(LINUX_SOURCE_DIR)/include \ rm -rf $(TARGET_DIR)/etc/iproute2
CC="$(TARGET_CC)" \ rm -rf $(TARGET_DIR)/var/lib/arpd
AR=$(TARGET_CROSS)ar \ rm -f $(addprefix $(TARGET_DIR)/sbin/, $(IPROUTE2_TARGET_SBINS))
NETEM_DIST="" \ endef
SUBDIRS="lib ip tc"
$(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY): $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $(eval $(call GENTARGETS,package,iproute2))
$(INSTALL) -m 0755 $(IPROUTE2_DIR)/ip/ip $(TARGET_DIR)/sbin/ip
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/sbin/ip
$(INSTALL) -m 0755 $(IPROUTE2_DIR)/$(IPROUTE2_BINARY) $@
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
iproute2: $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
iproute2-clean:
rm -f $(TARGET_DIR)/sbin/ip $(TARGET_DIR)/$(IPROUTE2_TARGET_BINARY)
-$(MAKE) -C $(IPROUTE2_DIR) clean
iproute2-dirclean:
rm -rf $(IPROUTE2_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_IPROUTE2),y)
TARGETS+=iproute2
endif