dhcpcd: bump to version 6.1.0

Now has proper support for nommu and non-IPv6.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/dhcpcd/Config.in b/package/dhcpcd/Config.in
index ddbc6f47812c1bc85096191c06665809043037a4..ac20615d5f060110ed2978a3713dd412665dcc0c 100644 (file)
--- a/package/dhcpcd/Config.in
+++ b/package/dhcpcd/Config.in
@@ -1,11 +1,9 @@
 config BR2_PACKAGE_DHCPCD
-       depends on BR2_INET_IPV6
-       depends on BR2_USE_MMU # fork()
        bool "dhcpcd"
+       # No support for AI_ADDRCONFIG
+       depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2 && \
+               !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
        help
          An RFC2131 compliant DHCP client
 
          http://roy.marples.name/downloads/dhcpcd
-
-comment "dhcpcd needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 13810f3a4620fa814cd5eecbd0fdae170143d6a4..80377062a858d938b31ffbffb6ccbf76649c81a5 100644 (file)
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -4,22 +4,29 @@
 #
 ################################################################################
 
-DHCPCD_VERSION = 5.6.7
+DHCPCD_VERSION = 6.1.0
 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.bz2
-DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd/
+DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
 DHCPCD_LICENSE = BSD-2c
 
+ifeq ($(BR2_INET_IPV6),)
+       DHCPCD_CONFIG_OPT += --disable-ipv6
+endif
+
+ifeq ($(BR2_USE_MMU),)
+       DHCPCD_CONFIG_OPT += --disable-fork
+endif
+
 define DHCPCD_CONFIGURE_CMDS
        (cd $(@D); \
-       ./configure \
+       $(TARGET_CONFIGURE_OPTS) ./configure \
                --target=$(BR2_GCC_TARGET_ARCH) \
                --os=linux \
                $(DHCPCD_CONFIG_OPT) )
 endef
 
 define DHCPCD_BUILD_CMDS
-       $(MAKE) \
-               $(TARGET_CONFIGURE_OPTS) \
+       $(TARGET_MAKE_ENV) $(MAKE) \
                -C $(@D) all
 endef