From: Peter Korsgaard <peter@korsgaard.com>
Date: Fri, 2 Sep 2016 14:20:33 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: 2016.11-rc1~1124
X-Git-Url: https://repo.jachan.dev/buildroot-mgba.git/commitdiff_plain/7353967690b425fd6519756979f3ef839b1a9cd1

Merge branch 'next'

Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

7353967690b425fd6519756979f3ef839b1a9cd1
diff --cc linux/Config.in
index c7bc4d8456,ebcafcc0ee..43d63c0cd0
--- a/linux/Config.in
+++ b/linux/Config.in
@@@ -101,15 -96,9 +95,9 @@@ config BR2_LINUX_KERNEL_CUSTOM_REPO_VER
  
  endif
  
- config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
- 	string "Path to the local directory"
- 	depends on BR2_LINUX_KERNEL_CUSTOM_LOCAL
- 	help
- 	  Path to the local directory with the Linux kernel source code.
- 
  config BR2_LINUX_KERNEL_VERSION
  	string
 -	default "4.7" if BR2_LINUX_KERNEL_LATEST_VERSION
 +	default "4.7.2" if BR2_LINUX_KERNEL_LATEST_VERSION
  	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
  		if BR2_LINUX_KERNEL_CUSTOM_VERSION
  	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --cc package/ffmpeg/Config.in
index 3a7bfd3122,6b7a6e7b1f..a3ca1054d9
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@@ -1,10 -1,7 +1,8 @@@
  config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
  	bool
  	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
- 	# ffmpeg's configure script only supports mips64 (r1) variant
 -	default y if !BR2_nios2
 +	# No support for ARMv7-M in the ARM assembly logic
- 	default y if !BR2_nios2 && !BR2_mips_64r2 && !BR2_mips_64r6 && \
- 		!BR2_ARM_CPU_ARMV7M
++	default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M
  
  menuconfig BR2_PACKAGE_FFMPEG
  	bool "ffmpeg"
diff --cc package/ffmpeg/ffmpeg.mk
index 5a19617992,fe6aa3d045..a90d437e4f
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@@ -447,15 -444,6 +447,7 @@@ FFMPEG_CONF_OPTS += --disable-mipsfp
  else
  FFMPEG_CONF_OPTS += --enable-mipsfpu
  endif
- 
- ifeq ($(BR2_mips_32r2),y)
- FFMPEG_CONF_OPTS += \
- 	--enable-mips32r2
- else
- FFMPEG_CONF_OPTS += \
- 	--disable-mips32r2
- endif
 +endif # MIPS
  
  ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
  FFMPEG_CONF_OPTS += --enable-altivec
diff --cc package/logrotate/logrotate.hash
index 8dee715658,ee31f8e051..3003d42547
--- a/package/logrotate/logrotate.hash
+++ b/package/logrotate/logrotate.hash
@@@ -1,3 -1,2 +1,3 @@@
  # Locally calculated
- sha256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 logrotate-3.9.2.tar.gz
+ sha256 db63b5932190cba941357c029b595a7fddf43539943aa1e0ca53a96136e4c5d9 logrotate-3.10.0.tar.gz
 +sha256 e0d360908ac506e02f08fa1ad70e17d6985045d8640f383fef8f322886d6e1e1 6a36c105587b07ad14fc937f3ee6e2eb402621a2.patch