Bump buildroot to 2019.02
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPROUTE2_VERSION = 4.14.1
|
||||
IPROUTE2_VERSION = 4.19.0
|
||||
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
|
||||
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
|
||||
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
|
||||
@@ -12,67 +12,38 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
|
||||
IPROUTE2_LICENSE = GPL-2.0+
|
||||
IPROUTE2_LICENSE_FILES = COPYING
|
||||
|
||||
# If both iproute2 and busybox are selected, make certain we win
|
||||
# the fight over who gets to have their utils actually installed.
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
IPROUTE2_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
IPROUTE2_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
# If we've got iptables enable xtables support for tc
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx)
|
||||
IPROUTE2_DEPENDENCIES += iptables
|
||||
define IPROUTE2_WITH_IPTABLES
|
||||
# Makefile is busted so it never passes IPT_LIB_DIR properly
|
||||
$(SED) "s/-DIPT/-DXT/" $(@D)/tc/Makefile
|
||||
endef
|
||||
else
|
||||
define IPROUTE2_WITH_IPTABLES
|
||||
define IPROUTE2_DISABLE_IPTABLES
|
||||
# m_xt.so is built unconditionally
|
||||
echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
|
||||
endef
|
||||
endif
|
||||
|
||||
# arpd needs BerkeleyDB and links against pthread
|
||||
ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185),y)
|
||||
IPROUTE2_DEPENDENCIES += berkeleydb
|
||||
else
|
||||
define IPROUTE2_DISABLE_ARPD
|
||||
echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
|
||||
endef
|
||||
endif
|
||||
|
||||
# ifcfg needs bash
|
||||
ifeq ($(BR2_PACKAGE_BASH),)
|
||||
define IPROUTE2_REMOVE_IFCFG
|
||||
rm -f $(TARGET_DIR)/sbin/ifcfg
|
||||
endef
|
||||
endif
|
||||
|
||||
define IPROUTE2_CONFIGURE_CMDS
|
||||
$(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
|
||||
cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
|
||||
$(IPROUTE2_DISABLE_ARPD)
|
||||
$(IPROUTE2_WITH_IPTABLES)
|
||||
$(IPROUTE2_DISABLE_IPTABLES)
|
||||
endef
|
||||
|
||||
define IPROUTE2_BUILD_CMDS
|
||||
$(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile
|
||||
$(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) \
|
||||
$(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
CFLAGS="$(TARGET_CFLAGS) -DXT_LIB_DIR=\\\"/usr/lib/xtables\\\"" \
|
||||
CBUILD_CFLAGS="$(HOST_CFLAGS)" $(MAKE) V=1 LIBDB_LIBS=-lpthread \
|
||||
DBM_INCLUDE="$(STAGING_DIR)/usr/include" \
|
||||
CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
|
||||
SHARED_LIBS="$(if $(BR2_STATIC_LIBS),n,y)" -C $(@D)
|
||||
endef
|
||||
|
||||
define IPROUTE2_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \
|
||||
SBINDIR=/sbin \
|
||||
DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \
|
||||
MANDIR=/usr/share/man install
|
||||
$(IPROUTE2_REMOVE_IFCFG)
|
||||
$(TARGET_MAKE_ENV) DESTDIR="$(TARGET_DIR)" $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user