From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 2 Dec 2019 08:39:41 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b24bd59c83346d8181dec0e29530b11851a74a9;p=buildroot.git

Merge branch 'next'

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

7b24bd59c83346d8181dec0e29530b11851a74a9
diff --cc Config.in.legacy
index aa66a564a9,7167b1d60c..c0274b65f4
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@@ -144,14 -144,14 +144,22 @@@ endi
  
  ###############################################################################
  
 -comment "Legacy options removed in 2019.11"
++comment "Legacy options removed in 2020.02"
+ 
+ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED
+ 	bool "rpi-userland start vcfiled was removed"
+ 	select BR2_LEGACY
+ 	help
+ 	  The vcfiled support was removed upstream.
+ 
 +comment "Legacy options removed in 2019.11"
 +
 +config BR2_PACKAGE_OPENVMTOOLS_PROCPS
 +	bool "openvmtools' procps support was removed"
 +	select BR2_LEGACY
 +	help
 +	  Upstream stopped supporting this option a while ago.
 +
  config BR2_PACKAGE_ALLJOYN
  	bool "alljoyn was removed"
  	select BR2_LEGACY
diff --cc linux/Config.in
index f291f671b5,eacd53dafb..14d737311a
--- a/linux/Config.in
+++ b/linux/Config.in
@@@ -122,8 -133,9 +133,9 @@@ endi
  
  config BR2_LINUX_KERNEL_VERSION
  	string
 -	default "5.3.8" if BR2_LINUX_KERNEL_LATEST_VERSION
 +	default "5.3.14" if BR2_LINUX_KERNEL_LATEST_VERSION
- 	default "v4.19.75-cip11" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+ 	default "4.19.82-cip14" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+ 	default "4.19.72-cip10-rt4" if BR2_LINUX_KERNEL_LATEST_CIP_RT_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/dtc/dtc.mk
index 96a64b70e4,add8e16647..d532487dd1
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@@ -8,10 -8,10 +8,10 @@@ DTC_VERSION = 1.5.
  DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz
  DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
  DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library)
- DTC_LICENSE_FILES = README.license GPL
+ DTC_LICENSE_FILES = README.license GPL BSD-2-Clause
  DTC_INSTALL_STAGING = YES
 -DTC_DEPENDENCIES = host-bison host-flex
 -HOST_DTC_DEPENDENCIES = host-bison host-flex
 +DTC_DEPENDENCIES = host-bison host-flex host-pkgconf
 +HOST_DTC_DEPENDENCIES = host-bison host-flex host-pkgconf
  
  DTC_MAKE_OPTS = \
  	PREFIX=/usr \
diff --cc package/perl/perl.hash
index c988ab752f,344e044460..161a4fd615
--- a/package/perl/perl.hash
+++ b/package/perl/perl.hash
@@@ -1,12 -1,7 +1,12 @@@
- # Hashes from: http://www.cpan.org/src/5.0/perl-5.28.2.tar.xz.{md5,sha1,sha256}.txt
- md5    6bb75770e9ba085b32bf13e4be71e4ac                                 perl-5.28.2.tar.xz
- sha1   e7be78eca9ac5596783e6abcf957408050a7b650                         perl-5.28.2.tar.xz
- sha256 0b0189bfa4b2da20e899b4bdd746ac402e8f746a58e4fcf5516484157f2aab07 perl-5.28.2.tar.xz
+ # Hashes from: http://www.cpan.org/src/5.0/perl-5.30.1.tar.xz.{md5,sha1,sha256}.txt
+ md5    f399f3aaee90ddcff5eadd3bccdaacc0                                 perl-5.30.1.tar.xz
+ sha1   4bc190b6ac368f573e6a028f91430f831d40d30a                         perl-5.30.1.tar.xz
+ sha256 7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 perl-5.30.1.tar.xz
  
- # Hashes from: https://github.com/arsv/perl-cross/releases/download/1.2.3/perl-cross-1.2.3.hash
- sha256 84583a1bb5f3a2c64d13d031386c114382e5c62955c6f84a27cec8318536627c perl-cross-1.2.3.tar.gz
+ # Hashes from: https://github.com/arsv/perl-cross/releases/download/1.3.1/perl-cross-1.3.1.hash
+ sha256	edce0b0c2f725e2db3f203d6d8e9f3f7161256f5d1590551e40694f21200141d perl-cross-1.3.1.tar.gz
 +
 +# Locally calculated
 +sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic
 +sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying
 +sha256 4a39adc445d79e213df5c2028c5432806dfcdfe69a5bc31ba5c83071a0097877 README
diff --cc package/qemu/qemu.mk
index 283577d749,1a5c642726..450ad61877
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@@ -297,9 -300,8 +300,9 @@@ define HOST_QEMU_CONFIGURE_CMD
  		--interp-prefix=$(STAGING_DIR) \
  		--cc="$(HOSTCC)" \
  		--host-cc="$(HOSTCC)" \
- 		--extra-cflags="$(HOST_CFLAGS)" \
+ 		--extra-cflags="$(HOST_QEMU_CFLAGS)" \
  		--extra-ldflags="$(HOST_LDFLAGS)" \
 +		--python=$(HOST_DIR)/bin/python3 \
  		$(HOST_QEMU_OPTS)
  endef