Merge tag '2017.11-rc2' into next

master has gained a number of autobuilder bugfixes since rc1, so merge these
to next to also fix them there.

diff --combined DEVELOPERS
index 7a4218d9c5141632d5b51b4cb3440abd2549e8e1,ddd675ea3aa2b61ed97b90427975da2403bf717d..37b7dfe8150f6064006aa09ef6019b701cb3b22d
--- 1/DEVELOPERS
--- 2/DEVELOPERS
+++ b/DEVELOPERS
@@@ -190,9 -190,15 +190,15 @@@ F:       package/sigrok-cli
  
  N:    Baruch Siach <baruch@tkos.co.il>
  F:    package/daemon/
+ F:    package/dropbear/
  F:    package/ebtables/
+ F:    package/i2c-tools/
+ F:    package/libcurl/
+ F:    package/libpcap/
  F:    package/openipmi/
  F:    package/socat/
+ F:    package/strace/
+ F:    package/tcpdump/
  F:    package/ti-uim/
  F:    package/uhubctl/
  
@@@ -1473,13 -1479,6 +1479,13 @@@ F:    package/mpir
  
  N:    Sergey Matyukevich <geomatsi@gmail.com>
  F:    package/xr819-xradio/
 +F:    package/armbian-firmware/
 +F:    board/orangepi/orangepi-zero
 +F:    board/orangepi/orangepi-one
 +F:    board/linksprite/pcduino
 +F:    configs/orangepi_one_defconfig
 +F:    configs/orangepi_zero_defconfig
 +F:    configs/linksprite_pcduino_defconfig
  
  N:    Sergio Prado <sergio.prado@e-labworks.com>
  F:    package/libgdiplus/

diff --combined package/mesa3d/mesa3d.mk
index 2667308a677ccf24f192fc29726b98961ae94a2f,5627344f02570c2abd6232748e94afa5a2274ac6..fb9418536731c6c12cf054bd2f43ad53635e2269
--- 1/package/mesa3d/mesa3d.mk
--- 2/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@@ -5,7 -5,7 +5,7 @@@
  ################################################################################
  
  # When updating the version, please also update mesa3d-headers
 -MESA3D_VERSION = 17.2.4
 +MESA3D_VERSION = 17.2.5
  MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
  MESA3D_SITE = https://mesa.freedesktop.org/archive
  MESA3D_LICENSE = MIT, SGI, Khronos
@@@ -26,6 -26,12 +26,12 @@@ MESA3D_DEPENDENCIES = 
  # Disable assembly usage.
  MESA3D_CONF_OPTS = --disable-asm
  
+ # Disable static, otherwise configure will fail with: "Cannot enable both static
+ # and shared."
+ ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+ MESA3D_CONF_OPTS += --disable-static
+ endif
+ 
  # The Sourcery MIPS toolchain has a special (non-upstream) feature to
  # have "compact exception handling", which unfortunately breaks with
  # mesa3d, so we disable it here by passing -mno-compact-eh.