Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
Pascal Vizeli
@@ -11,61 +11,106 @@
|
||||
# and IPv6 updates.
|
||||
# http://www.spinics.net/lists/netdev/msg279881.html
|
||||
|
||||
IPUTILS_VERSION = s20180629
|
||||
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
|
||||
IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
|
||||
# Only includes a license file for BSD
|
||||
IPUTILS_LICENSE_FILES = ninfod/COPYING
|
||||
|
||||
IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\
|
||||
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
|
||||
IPUTILS_VERSION = 20190709
|
||||
IPUTILS_SITE = $(call github,iputils,iputils,s$(IPUTILS_VERSION))
|
||||
IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause
|
||||
IPUTILS_LICENSE_FILES = LICENSE Documentation/LICENSE.BSD3 Documentation/LICENSE.GPL2
|
||||
IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
IPUTILS_MAKE_OPTS += USE_CAP=yes
|
||||
IPUTILS_CONF_OPTS += -DUSE_CAP=true
|
||||
IPUTILS_DEPENDENCIES += libcap
|
||||
else
|
||||
IPUTILS_MAKE_OPTS += USE_CAP=no
|
||||
IPUTILS_CONF_OPTS += -DUSE_CAP=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
IPUTILS_MAKE_OPTS += USE_GCRYPT=yes
|
||||
IPUTILS_DEPENDENCIES += libgcrypt
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN2),y)
|
||||
IPUTILS_CONF_OPTS += -DUSE_IDN=true
|
||||
IPUTILS_DEPENDENCIES += libidn2
|
||||
else
|
||||
IPUTILS_MAKE_OPTS += USE_GCRYPT=no
|
||||
IPUTILS_CONF_OPTS += -DUSE_IDN=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETTLE),y)
|
||||
IPUTILS_MAKE_OPTS += USE_NETTLE=yes
|
||||
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle
|
||||
IPUTILS_DEPENDENCIES += nettle
|
||||
else
|
||||
IPUTILS_MAKE_OPTS += USE_NETTLE=no
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
IPUTILS_MAKE_OPTS += USE_CRYPTO=yes
|
||||
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=gcrypt
|
||||
IPUTILS_DEPENDENCIES += libgcrypt
|
||||
else ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=openssl
|
||||
IPUTILS_DEPENDENCIES += openssl
|
||||
else ifeq ($(BR2_PACKAGE_LINUX_HEADERS),y)
|
||||
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=kernel
|
||||
IPUTILS_DEPENDENCIES += linux-headers
|
||||
else
|
||||
IPUTILS_MAKE_OPTS += USE_CRYPTO=no
|
||||
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=none
|
||||
# BUILD_NINFOD=true and USE_CRYPTO=none cannot be combined
|
||||
IPUTILS_NINFOD = n
|
||||
endif
|
||||
|
||||
define IPUTILS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
|
||||
endef
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
IPUTILS_DEPENDENCIES += systemd
|
||||
endif
|
||||
|
||||
define IPUTILS_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 755 $(@D)/arping $(TARGET_DIR)/sbin/arping
|
||||
$(INSTALL) -D -m 755 $(@D)/clockdiff $(TARGET_DIR)/bin/clockdiff
|
||||
$(INSTALL) -D -m 755 $(@D)/ping $(TARGET_DIR)/bin/ping
|
||||
$(INSTALL) -D -m 755 $(@D)/rarpd $(TARGET_DIR)/sbin/rarpd
|
||||
$(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc
|
||||
$(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd
|
||||
$(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath
|
||||
$(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
|
||||
endef
|
||||
# ninfod requires <pthread.h>
|
||||
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
IPUTILS_NINFOD = n
|
||||
endif
|
||||
|
||||
ifeq ($(IPUTILS_NINFOD),n)
|
||||
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
|
||||
else
|
||||
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
|
||||
IPUTILS_CONF_OPTS += -DUSE_GETTEXT=true
|
||||
else
|
||||
IPUTILS_CONF_OPTS += -DUSE_GETTEXT=false
|
||||
endif
|
||||
|
||||
IPUTILS_CONF_OPTS += -DBUILD_TRACEROUTE6=true
|
||||
|
||||
# XSL Stylesheets for DocBook 5 not packaged for buildroot
|
||||
IPUTILS_CONF_OPTS += -DBUILD_MANS=false -DBUILD_HTML_MANS=false
|
||||
|
||||
# move iputils binaries to the same location as where Busybox installs
|
||||
# the corresponding applets, so that we have a single version of the
|
||||
# tools (from iputils)
|
||||
define IPUTILS_MOVE_BINARIES
|
||||
mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping
|
||||
$(if $(BR2_ROOTFS_MERGED_USR),,\
|
||||
mv $(TARGET_DIR)/usr/bin/ping $(TARGET_DIR)/bin/ping)
|
||||
mv $(TARGET_DIR)/usr/bin/tftpd $(TARGET_DIR)/usr/sbin/tftpd
|
||||
endef
|
||||
IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES
|
||||
|
||||
# upstream requires distros to create symlink
|
||||
define IPUTILS_CREATE_PING6_SYMLINK
|
||||
ln -sf ping $(TARGET_DIR)/bin/ping6
|
||||
endef
|
||||
IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_CREATE_PING6_SYMLINK
|
||||
|
||||
# handle permissions ourselves
|
||||
IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true
|
||||
ifeq ($(BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES),y)
|
||||
define IPUTILS_PERMISSIONS
|
||||
/bin/ping f 4755 0 0 - - - - -
|
||||
/bin/traceroute6 f 4755 0 0 - - - - -
|
||||
/usr/sbin/arping f 755 0 0 - - - - -
|
||||
/usr/bin/clockdiff f 755 0 0 - - - - -
|
||||
|xattr cap_net_raw+p
|
||||
/bin/ping f 755 0 0 - - - - -
|
||||
|xattr cap_net_raw+p
|
||||
/usr/bin/traceroute6 f 755 0 0 - - - - -
|
||||
|xattr cap_net_raw+p
|
||||
endef
|
||||
else
|
||||
define IPUTILS_PERMISSIONS
|
||||
/usr/sbin/arping f 755 0 0 - - - - -
|
||||
/usr/bin/clockdiff f 4755 0 0 - - - - -
|
||||
/bin/ping f 4755 0 0 - - - - -
|
||||
/usr/bin/traceroute6 f 4755 0 0 - - - - -
|
||||
endef
|
||||
endif
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(meson-package))
|
||||
|
||||
Reference in New Issue
Block a user