Bump version 4.10

* Make odroid upstream again

* Fix question

* Linux 5.7

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>

* Add patch

* Add DT sound

* fix build

* Fix kernel options

* working audio

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -9,9 +9,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         ca-certificates \
         curl \
         gpg-agent \
+        gpg \
+        dirmngr \
         software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     && apt-get update && apt-get install -y --no-install-recommends \
         docker-ce \
     && rm -rf /var/lib/apt/lists/*
@@ -21,25 +23,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         bash \
         bc \
         binutils \
-        bison \
+        build-essential \
         bzip2 \
         cpio \
         file \
-        flex \
-        g++ \
         git \
-        locales \
         make \
         ncurses-dev \
         patch \
         perl \
         python \
-        qemu-utils \
         rsync \
         sudo \
         unzip \
-        vim \
         wget \
+        qemu-utils \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry

Documentation/kernel.md

@@ -5,14 +5,14 @@ Default Kernel tree: 5.4
 
 | Board | Version |
 |-------|---------|
-| Open Virtual Applicance | 5.4.42 |
+| Open Virtual Applicance | 5.4.44 |
-| Raspberry Pi | 5.4.42 |
+| Raspberry Pi | 4.19.126 |
-| Raspberry Pi 0-W | 5.4.42 |
+| Raspberry Pi 0-W | 4.19.126 |
-| Raspberry Pi 2 | 5.4.42 |
+| Raspberry Pi 2 | 4.19.126 |
-| Raspberry Pi 3 | 5.4.42 |
+| Raspberry Pi 3 | 4.19.126 |
-| Raspberry Pi 4 | 5.4.42 |
+| Raspberry Pi 4 | 4.19.126 |
-| Tinker Board | 5.4.42 |
+| Tinker Board | 5.4.44 |
-| Odroid-C2 | 5.4.41 |
+| Odroid-C2 | 5.7.0 |
-| Odroid-N2 | 5.4.41 |
+| Odroid-N2 | 5.7.0 |
-| Odroid-XU4 | 5.4.41 |
+| Odroid-XU4 | 5.7.0 |
-| Intel NUC | 5.4.42 |
+| Intel NUC | 5.4.44 |

buildroot-external/board/hardkernel/patches/linux/0001-FROMLIST-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch

@@ -1,39 +0,0 @@
-From 81b290367d59103d1f041709c56a3de1c360e102 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Mon, 13 May 2019 14:45:31 +0200
-Subject: [PATCH] FROMLIST: clk: meson: g12a: fix gp0 and hifi ranges
-
-While some SoC samples are able to lock with a PLL factor of 55, others
-samples can't. ATM, a minimum of 60 appears to work on all the samples
-I have tried.
-
-Even with 60, it sometimes takes a long time for the PLL to eventually
-lock. The documentation says that the minimum rate of these PLLs DCO
-should be 3GHz, a factor of 125. Let's use that to be on the safe side.
-
-With factor range changed, the PLL seems to lock quickly (enough) so far.
-It is still unclear if the range was the only reason for the delay.
-
-Fixes: 085a4ea93d54 ("clk: meson: g12a: add peripheral clock controller")
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
----
- drivers/clk/meson/g12a.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
-index b3af61cc6fb9..66cf791bfc8c 100644
---- a/drivers/clk/meson/g12a.c
-+++ b/drivers/clk/meson/g12a.c
-@@ -1591,7 +1591,7 @@ static struct clk_regmap g12b_cpub_clk_trace = {
- };
- 
- static const struct pll_mult_range g12a_gp0_pll_mult_range = {
--	.min = 55,
-+	.min = 125,
- 	.max = 255,
- };
- 
--- 
-2.17.1
-

buildroot-external/board/hardkernel/patches/linux/0001-Fix-N2-audio.patch

@@ -0,0 +1,154 @@
+From 2fb3aa8c5f1534718cce1afd2bf61b1d21a5c851 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 5 Jun 2020 20:09:56 +0000
+Subject: [PATCH 1/1] Fix N2 audio
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 13 ++++++
+ arch/arm64/boot/dts/amlogic/meson-g12.dtsi    |  9 +++++
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 40 +++++++++++++++++--
+ 3 files changed, 58 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index c0aef7d69117..bfddca4f91bb 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -9,6 +9,8 @@
+ #include <dt-bindings/clock/g12a-aoclkc.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
++#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
++#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
+ #include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
+ #include <dt-bindings/thermal/thermal.h>
+ 
+@@ -250,6 +252,17 @@
+ 				};
+ 			};
+ 
++			acodec: audio-controller@32000 {
++				compatible = "amlogic,t9015";
++				reg = <0x0 0x32000 0x0 0x14>;
++				#sound-dai-cells = <0>;
++				sound-name-prefix = "ACODEC";
++				clocks = <&clkc CLKID_AUDIO_CODEC>;
++				clock-names = "pclk";
++				resets = <&reset RESET_AUDIO_CODEC>;
++				status = "disabled";
++			};
++
+ 			periphs: bus@34400 {
+ 				compatible = "simple-bus";
+ 				reg = <0x0 0x34400 0x0 0x400>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+index 55d39020ec72..0d14409f509c 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi
+@@ -343,6 +343,15 @@
+ 			status = "disabled";
+ 		};
+ 
++		toacodec: audio-controller@740 {
++			compatible = "amlogic,g12a-toacodec";
++			reg = <0x0 0x740 0x0 0x4>;
++			#sound-dai-cells = <1>;
++			sound-name-prefix = "TOACODEC";
++			resets = <&clkc_audio AUD_RESET_TOACODEC>;
++			status = "disabled";
++		};
++
+ 		tohdmitx: audio-controller@744 {
+ 			compatible = "amlogic,g12a-tohdmitx";
+ 			reg = <0x0 0x744 0x0 0x4>;
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+index 169ea283d4ee..b0fb25892964 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -10,6 +10,7 @@
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/gpio/meson-g12a-gpio.h>
+ #include <dt-bindings/sound/meson-g12a-tohdmitx.h>
++#include <dt-bindings/sound/meson-g12a-toacodec.h>
+ 
+ / {
+ 	compatible = "hardkernel,odroid-n2", "amlogic,s922x", "amlogic,g12b";
+@@ -24,6 +25,20 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
++	dio2133: audio-amplifier-0 {
++		compatible = "simple-audio-amplifier";
++		enable-gpios = <&gpio_ao GPIOAO_2 GPIO_ACTIVE_HIGH>;
++		VCC-supply = <&vcc_5v>;
++		sound-name-prefix = "AMP";
++	};
++
++	spdif_dit: audio-codec-1 {
++		#sound-dai-cells = <0>;
++		compatible = "linux,spdif-dit";
++		status = "okay";
++		sound-name-prefix = "DIT";
++	};
++
+ 	memory@0 {
+ 		device_type = "memory";
+ 		reg = <0x0 0x0 0x0 0x40000000>;
+@@ -209,11 +224,13 @@
+ 	sound {
+ 		compatible = "amlogic,axg-sound-card";
+ 		model = "G12B-ODROID-N2";
+-		audio-aux-devs = <&tdmout_b>;
++		audio-aux-devs = <&tdmout_b>, <&dio2133>;
+ 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
+ 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
+ 				"TDMOUT_B IN 2", "FRDDR_C OUT 1",
+-				"TDM_B Playback", "TDMOUT_B OUT";
++				"TDM_B Playback", "TDMOUT_B OUT",
++				"AMP INL", "ACODEC LOLP",
++				"AMP INR", "ACODEC LORP";
+ 
+ 		assigned-clocks = <&clkc CLKID_MPLL2>,
+ 				  <&clkc CLKID_MPLL0>,
+@@ -251,14 +268,21 @@
+ 			};
+ 		};
+ 
+-		/* hdmi glue */
+ 		dai-link-4 {
+ 			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
+ 
+-			codec {
++			codec@0 {
+ 				sound-dai = <&hdmi_tx>;
+ 			};
+ 		};
++
++		dai-link-5 {
++			sound-dai = <&toacodec TOACODEC_OUT>;
++
++			codec@0 {
++				sound-dai = <&acodec>;
++			};
++		};
+ 	};
+ };
+ 
+@@ -484,6 +508,14 @@
+ 	status = "okay";
+ };
+ 
++&toacodec {
++	status = "okay";
++};
++
++&acodec {
++	status = "okay";
++};
++
+ &uart_AO {
+ 	status = "okay";
+ 	pinctrl-0 = <&uart_ao_a_pins>;
+-- 
+2.17.1
+

buildroot-external/board/hardkernel/patches/linux/0001-Odroid-N2-arm64-dts-fix-audio-name.patch

@@ -1,26 +0,0 @@
-From 122cb1d72a440bc6a84e50b1ed40af7ed7f737c6 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Mon, 27 Apr 2020 23:41:44 +0000
-Subject: [PATCH 1/1] Odroid-N2: arm64/dts: fix audio name
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-index 1cf9af35e435..f0aac838bc46 100644
---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
-@@ -227,7 +227,7 @@
- 
- 	sound {
- 		compatible = "amlogic,axg-sound-card";
--		model = "G12A-ODROIDN2";
-+		model = "G12B-ODROID-N2";
- 		audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&dio2133>;
- 		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",
- 				"TDMOUT_B IN 1", "FRDDR_B OUT 1",
--- 
-2.17.1
-

buildroot-external/board/intel/ova/home-assistant.ovf

@@ -81,8 +81,8 @@
       <Item>
         <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
         <rasd:Caption>eth0</rasd:Caption>
-        <rasd:Description>Ethernet adapter</rasd:Description>
         <rasd:Connection>Bridged</rasd:Connection>
+        <rasd:Description>Ethernet adapter</rasd:Description>
         <rasd:ElementName>eth0</rasd:ElementName>
         <rasd:InstanceID>6</rasd:InstanceID>
         <rasd:ResourceSubType>E1000</rasd:ResourceSubType>

buildroot-external/board/raspberrypi/patches/linux/0001-rpi-dts-allow-uboot-find-serial.patch

@@ -1,26 +0,0 @@
-From b8cabc02384390446cb7f2e34af07b44881246e3 Mon Sep 17 00:00:00 2001
-From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 22:03:34 +0000
-Subject: [PATCH 1/1] rpi-dts: allow uboot find serial
-
-Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
----
- arch/arm/boot/dts/bcm283x.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 7e95601376d0..82a0ee0d5889 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -306,7 +306,7 @@
- 		};
- 
- 		uart0: serial@7e201000 {
--			compatible = "arm,pl011", "arm,primecell";
-+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
- 			reg = <0x7e201000 0x200>;
- 			interrupts = <2 25>;
- 			clocks = <&clocks BCM2835_CLOCK_UART>,
--- 
-2.17.1
-

buildroot-external/configs/intel_nuc_defconfig

@@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.44"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/nuc/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y

buildroot-external/configs/odroid_c2_defconfig

@@ -21,8 +21,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -56,7 +56,6 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -89,7 +88,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/odroid_n2_defconfig

@@ -21,8 +21,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-amlogic.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
@@ -56,7 +56,6 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -89,7 +88,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -22,10 +22,9 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4 $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="exynos"
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/kernel-exynos.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -59,7 +58,6 @@ BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
 BR2_PACKAGE_DHCP=y
 BR2_PACKAGE_DHCP_CLIENT=y
-BR2_PACKAGE_WIREGUARD_LINUX_COMPAT=y
 BR2_PACKAGE_DROPBEAR=y
 # BR2_PACKAGE_DROPBEAR_CLIENT is not set
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
@@ -94,7 +92,7 @@ BR2_TARGET_UBOOT_FORMAT_DTB_BIN=y
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/ova_defconfig

@@ -23,7 +23,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.44"
 BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config $(BR2_EXTERNAL_HASSOS_PATH)/board/intel/ova/kernel.config"
 BR2_LINUX_KERNEL_LZ4=y

buildroot-external/configs/rpi0_w_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/rpi2_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -90,12 +90,12 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSIO_ARCH="armhf"
+BR2_PACKAGE_HASSIO_ARCH="armv7"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/rpi3_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -91,7 +91,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/rpi4_64_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot64.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/rpi4_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4 $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2711"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -92,7 +92,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/rpi_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/79495a5ecdfba69de51e88701a69c42d09806d84.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/f6b3ac28f0a9137d4c24c0b8832e693bbd16f5b7.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"
 BR2_LINUX_KERNEL_LZ4=y
@@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config"
 BR2_TARGET_UBOOT_BOOT_SCRIPT=y
 BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot-boot.ush"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y

buildroot-external/configs/tinker_defconfig

@@ -24,7 +24,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/hassos-hook.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.42"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.44"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/kernel.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/kernel/hassos.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/docker.config $(BR2_EXTERNAL_HASSOS_PATH)/kernel/device-support.config"

buildroot-external/kernel/hassos.config

@@ -41,3 +41,5 @@ CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DFS_UPCALL=y
+
+CONFIG_WIREGUARD=m

buildroot-external/meta

@@ -1,5 +1,5 @@
 VERSION_MAJOR=4
-VERSION_BUILD=7
+VERSION_BUILD=10
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

buildroot-external/package/hassio/builder/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -10,9 +10,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         curl \
         jq \
         gpg-agent \
+        gpg \
+        dirmngr \
         software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     && apt-get update && apt-get install -y --no-install-recommends \
         docker-ce docker-ce-cli containerd.io \
     && rm -rf /var/lib/apt/lists/*

buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service

@@ -11,9 +11,9 @@ StartLimitBurst=5
 Type=simple
 Restart=always
 RestartSec=5s
-ExecStartPre=-/usr/bin/docker stop hassos_supervisor
+ExecStartPre=-/usr/bin/docker stop hassio_supervisor
 ExecStart=/usr/sbin/hassos-supervisor
-ExecStop=-/usr/bin/docker stop hassos_supervisor
+ExecStop=-/usr/bin/docker stop hassio_supervisor
 
 [Install]
 WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/libexec/hassos-data

@@ -65,7 +65,7 @@ if sfdisk -dq "${OLD_DEVICE_ROOT}" | grep -q 'label: gpt'; then
     sgdisk -v "${OLD_DEVICE_ROOT}"
 
 else
-    sfdisk --delete "${OLD_PART_NUM}" "${OLD_DEVICE_ROOT}" --force
+    sfdisk --delete "${OLD_DEVICE_ROOT}" "${OLD_PART_NUM}" --force
     sfdisk -V "${OLD_DEVICE_ROOT}"
 fi
 

buildroot-external/rootfs-overlay/usr/sbin/hassos-cli

@@ -3,12 +3,18 @@
 # Run logging cli
 # ==============================================================================
 
-docker container exec \
+# Run CLI container
-    -ti hassio_cli \
+if [ "$(docker ps -q -f name=hassio_cli)" ]; then
-    /usr/bin/cli.sh \
+    docker container exec \
+        -ti hassio_cli \
+        /usr/bin/cli.sh \
 
-# Jump to root login shell
+    # Jump to root login shell
-if [ $? -eq 10 ]; then
+    if [ $? -eq 10 ]; then
+        /bin/ash -l
+    fi
+else
+    echo "[ERROR] Somethings going wrong! Jump into emergency console..."
     /bin/ash -l
 fi
 

buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor

@@ -9,16 +9,72 @@ set -e
 . /etc/os-release
 
 # Init supervisor
+SUPERVISOR_MIN_RUNTIME=30
 SUPERVISOR_IMAGE="homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor"
 SUPERVISOR_DATA=/mnt/data/supervisor
-SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}")
+SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}" || echo "")
 SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
 
-runSupervisor() {
+# Check if previous runtime of the container meets the minimal runtime
-    docker container rm --force hassio_supervisor || true
+# If not, we might be in trouble. Image or container corruption, bad release?
+# Delete the container, delete the image, pull a fresh one
+if [ -n "${SUPERVISOR_CONTAINER_ID}" ]; then
+    SUPERVISOR_START=$(docker inspect --format='{{.State.StartedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g")
+    SUPERVISOR_STOP=$(docker inspect --format='{{.State.FinishedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g")
 
+    if [ -n "${SUPERVISOR_START}" ] && [ -n "${SUPERVISOR_STOP}" ]; then
+        START=$(date --date="${SUPERVISOR_START}" +%s)
+        STOP=$(date --date="${SUPERVISOR_STOP}" +%s)
+        SUPERVISOR_RUNTIME=$((STOP-START))
+        # Minimial runtime not met, remove container and image
+        if [ "${SUPERVISOR_RUNTIME}" -lt "${SUPERVISOR_MIN_RUNTIME}" ]; then
+            echo "[WARNING] Supervisor container exited too quickly, forcing a fresh image and container..."
+            docker container rm --force hassio_supervisor || true
+            SUPERVISOR_CONTAINER_ID=""
+            docker rmi --force "${SUPERVISOR_IMAGE_ID}" || true
+            SUPERVISOR_IMAGE_ID=""
+        fi
+    fi
+fi
+
+# If Supervisor image is missing, pull it
+if [ -z "${SUPERVISOR_IMAGE_ID}" ]; then
+    # Get the latest from update information
+    # Using updater information instead of config. If the config version is
+    # broken, this creates a way (e.g., bad release).
+    SUPERVISOR_VERSION_UPDATER=$(jq -r '.version // empty' "${SUPERVISOR_DATA}/updater.json" || echo "")
+    SUPERVISOR_VERSION="${SUPERVISOR_VERSION_UPDATER:-latest}"
+
+    echo "[WARNING] Supervisor image missing, downloading a fresh one: ${SUPERVISOR_VERSION}"
+
+    # Pull in the Supervisor
+    if docker pull "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}"; then
+        # Tag as latest if versioned
+        if [ "${SUPERVISOR_VERSION}" != "latest" ]; then
+            docker tag "${SUPERVISOR_IMAGE}:${SUPERVISOR_VERSION}" "${SUPERVISOR_IMAGE}:latest"
+        fi
+    else
+        # Pull failed, updater info might be corrupted, re-trying with latest
+        echo "[WARNING] Supervisor downloading failed trying: latest"
+        docker pull "${SUPERVISOR_IMAGE}:latest"
+    fi
+
+    SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}" || echo "")
+fi
+
+# Image changed, remove previous container
+if [ -n "${SUPERVISOR_CONTAINER_ID}" ] && [ "${SUPERVISOR_IMAGE_ID}" != "${SUPERVISOR_CONTAINER_ID}" ]; then
+    echo "[INFO] Supervisor image has been updated, destroying previous container..."
+    docker container rm --force hassio_supervisor || true
+    SUPERVISOR_CONTAINER_ID=""
+fi
+
+# If Supervisor container is missing, create it
+if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
+    echo "[INFO] Creating a new Supervisor container..."
     # shellcheck disable=SC2086
-    docker container run --name hassio_supervisor \
+    docker container create \
+        --name hassio_supervisor \
         --privileged --security-opt apparmor="hassio-supervisor" \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v /var/run/dbus:/var/run/dbus \
@@ -27,9 +83,10 @@ runSupervisor() {
         -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
         -e SUPERVISOR_NAME=hassio_supervisor \
         -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \
-        "${SUPERVISOR_IMAGE}"
+        "${SUPERVISOR_IMAGE}:latest"
-}
+fi
 
 # Run supervisor
 mkdir -p ${SUPERVISOR_DATA}
-([ "${SUPERVISOR_IMAGE_ID}" = "${SUPERVISOR_CONTAINER_ID}" ] && docker container start --attach hassio_supervisor) || runSupervisor
+echo "[INFO] Starting the Supervisor..."
+exec docker container start --attach hassio_supervisor

buildroot-patches/0002-rpi-firmware-Bump-firmware.patch

@@ -16,7 +16,7 @@ index 59ab1da0c6..e3ba1bf99c 100644
 @@ -1,3 +1,3 @@
  # Locally computed
 -sha256 31a84340be08be319570a9d1439f25c0e3513fed73065a56aa5dd61dd605d5d9 rpi-firmware-01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5.tar.gz
-+sha256 467cb4b93204210a47cf112d352d7e1090596c665f85fe54e9e36fd86642c5aa rpi-firmware-a6c9b6b48ce86ef2527586a50760d52f1b33f642.tar.gz
++sha256 4789d4422b3bc7eab157471ba36aebd54efc2a6de4c937f5cfdb4392af04fe80 rpi-firmware-7caead9416f64b2d33361c703fb243b8e157eba4.tar.gz
  sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 6fee60b08c..2177ca9859 100644
@@ -27,7 +27,7 @@ index 6fee60b08c..2177ca9859 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = 01ecfd2ba2b7cf3a2f4aa75ada895ee4a3e729f5
-+RPI_FIRMWARE_VERSION = a6c9b6b48ce86ef2527586a50760d52f1b33f642
++RPI_FIRMWARE_VERSION = 7caead9416f64b2d33361c703fb243b8e157eba4
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot-patches/0008-Linux-5.7.patch

@@ -0,0 +1,68 @@
+From e36dc9a2a030204b5b6c6868348878b596f88de3 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Fri, 5 Jun 2020 14:18:26 +0000
+Subject: [PATCH 1/1] Linux 5.7
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/linux-headers/Config.in.host               | 4 ++++
+ toolchain/Config.in                                | 5 +++++
+ .../toolchain-external-custom/Config.in.options    | 4 ++++
+ 3 files changed, 13 insertions(+)
+
+diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
+index 95e85a00..88b9ff99 100644
+--- a/package/linux-headers/Config.in.host
++++ b/package/linux-headers/Config.in.host
+@@ -127,6 +127,10 @@ choice
+ 	  If your kernel headers are more recent than the latest version
+ 	  in the choice, then select the latest version.
+ 
++config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7
++	bool "5.7.x or later"
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++
+ config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4
+ 	bool "5.4.x or later"
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+diff --git a/toolchain/Config.in b/toolchain/Config.in
+index bff57280..c07a92ce 100644
+--- a/toolchain/Config.in
++++ b/toolchain/Config.in
+@@ -470,6 +470,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
+ 	select BR2_TOOLCHAIN_HEADERS_LATEST
+ 
++config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++	bool
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
++
+ # This should be selected by the latest version, above, to indicate that
+ # Buildroot does not know of more recent headers than the ones selected.
+ # This allows using toolchains with headers more recent than Buildroot
+@@ -481,6 +485,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
+ # stops affecting a value on the first matching default.
+ config BR2_TOOLCHAIN_HEADERS_AT_LEAST
+ 	string
++	default "5.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
+ 	default "5.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+ 	default "5.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
+ 	default "5.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2
+diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+index 8c38dd9f..b49231e1 100644
+--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
++++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+@@ -115,6 +115,10 @@ choice
+ 	  If your toolchain uses headers newer than the latest version
+ 	  in the choice, then select the latest version.
+ 
++config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7
++	bool "5.7.x or later"
++	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
++
+ config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4
+ 	bool "5.4.x or later"
+ 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+-- 
+2.17.1
+

buildroot-patches/0009-linux-forcibly-disable-use-of-gcc-plugins.patch

@@ -0,0 +1,123 @@
+From 40e0bf4c0c36970f8e94591fdb0a5a8910bf9859 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 12 May 2020 22:33:53 +0200
+Subject: [PATCH 1/1] linux: forcibly disable use of gcc plugins
+
+The soon-to-be-released linux 5.7 has changed the way it detects the
+ability of gcc to use plugins, when it dropped support for gcc 4.7 or
+older [0].
+
+To detect the ability to use gcc plugins, the kernel has to check
+whether the host gcc is capable enough to build them.
+
+When we call one of the configurator for the Linux kernel, we explicitly
+pass a value of HOSTCC=$(HOSTCC_NOCCACHE), because there might be a
+discrepancy between the ncurses headers and libraries as found by the
+Linux kconfig build [1] [2].
+
+But then, when we build the kernel, we pass another value to use [3]
+HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" which boils down to
+roughly: gcc -I.../host/include -L.../host/lib -Wl,-rpath,.../host/lib
+This is needed so that at build time, the kernel can build host tools
+that link with our openssl et al.
+
+So, the two HOSTCC we pass to the kernel may have different behaviours.
+For example, on a machine where gmp is missing in the system, it is
+available in $(O)/host/ when using an internal toolchain (and under a
+few other conditions).
+
+In that case, when configuring the kernel, it decides that the host
+compiler can't build plugins, so the dependencies of CONFIG_GCC_PLUGINS
+are not met, and that option is not present in the linux' .config file
+(neither as "=y" nor as "is not set"). But then, when we build the
+kernel, the host compiler suddenly becomes capable of building the
+plugins, and the internal syncconfig run by the kernel will notice that
+the dependencies of CONFIG_GCC_PLUGINS are now met, and that the user
+shall decide on its value. And this blocks a build on an interactive
+console (abbreviated):
+
+    * Restart config...
+    * GCC plugins
+    GCC plugins (GCC_PLUGINS) [Y/n/?] (NEW) _
+
+But most problematic is the behaviour when run in a shell that is not
+interactiove (e.g. a CI job or such) (abbreviated):
+
+    * Restart config...
+    * GCC plugins
+    GCC plugins (GCC_PLUGINS) [Y/n/?] (NEW)
+    Error in reading or end of file.
+      Generate some entropy during boot and runtime (GCC_PLUGIN_LATENT_ENTROPY) [N/y/?] (NEW)
+    Error in reading or end of file.
+      Randomize layout of sensitive kernel structures (GCC_PLUGIN_RANDSTRUCT) [N/y/?] (NEW)
+    Error in reading or end of file.
+    * Memory initialization
+    Initialize kernel stack variables at function entry
+    > 1. no automatic initialization (weakest) (INIT_STACK_NONE)
+      2. zero-init structs marked for userspace (weak) (GCC_PLUGIN_STRUCTLEAK_USER) (NEW)
+      3. zero-init structs passed by reference (strong) (GCC_PLUGIN_STRUCTLEAK_BYREF) (NEW)
+      4. zero-init anything passed by reference (very strong) (GCC_PLUGIN_STRUCTLEAK_BYREF_ALL) (NEW)
+    choice[1-4?]:
+    Error in reading or end of file.
+    Poison kernel stack before returning from syscalls (GCC_PLUGIN_STACKLEAK) [N/y/?] (NEW)
+    Error in reading or end of file.
+    Enable heap memory zeroing on allocation by default (INIT_ON_ALLOC_DEFAULT_ON) [N/y/?] n
+    Enable heap memory zeroing on free by default (INIT_ON_FREE_DEFAULT_ON) [N/y/?] n
+
+The most obvious and simple solution would be to unconditionally disable
+gcc plugins altogether, in the KCONFIG_FIXUP hook. But that can't work
+either, because after applying the fixups, we call olddefconfig (or the
+likes) with the incapable HOSTCC, so the disabled option would be removed
+anyway, and we'd be back to square one.
+
+So, in addition to the above, we also forcibly hack the same call just
+before actually building the kernel.
+
+Note that the two are needed: the one in the fixups is needed for those
+that have a system that already allows building gcc plugins, and the
+second is needed in the other case, where the system does not allow it
+but would work with our additional headers and libs in $(O)/host/. The
+two ensure there is a very similar experience in the two situations.
+
+Forcibly disabling the use of gcc plugins is not a regression on our
+side: it has never been possible to do so so far. We're now making sure
+that can't work by accident.
+
+Reported-by: Ganesh <ganesh45in@gmail.com>,
+Reported-by: Heiko Thiery <heiko.thiery@gmail.com>
+Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
+Cc: Michael Walle <michael.walle@kontron.com>
+Cc: Peter Korsgaard <peter@korsgaard.com>
+Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Cc: Arnout Vandecappelle <arnout@mind.be>
+Tested-by: Heiko Thiery <heiko.thiery@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ linux/linux.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/buildroot/linux/linux.mk b/buildroot/linux/linux.mk
+index ae1edbeb..5a1cb42e 100644
+--- a/buildroot/linux/linux.mk
++++ b/buildroot/linux/linux.mk
+@@ -408,6 +408,7 @@ define LINUX_KCONFIG_FIXUP_CMDS
+ 		$(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config)
+ 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config)
+ 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224,$(@D)/.config))
++	$(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config)
+ endef
+ 
+ ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
+@@ -467,7 +468,10 @@ endif
+ # '$(LINUX_TARGET_NAME)' targets separately because calling them in
+ # the same $(MAKE) invocation has shown to cause parallel build
+ # issues.
++# The call to disable gcc-plugins is a stop-gap measure:
++#   http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html
+ define LINUX_BUILD_CMDS
++	$(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config)
+ 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
+ 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
+ 	)
+-- 
+2.17.1

buildroot-patches/0010-Bump-wireguard-linux-compat.patch

@@ -0,0 +1,37 @@
+From e7becf35dd9d78fd7be773c765904cea1199ad14 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Sat, 6 Jun 2020 22:51:33 +0000
+Subject: [PATCH 1/1] Bump wireguard-linux-compat
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/wireguard-linux-compat/wireguard-linux-compat.hash | 2 +-
+ package/wireguard-linux-compat/wireguard-linux-compat.mk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.hash b/package/wireguard-linux-compat/wireguard-linux-compat.hash
+index d308f47a13..6835f98d09 100644
+--- a/package/wireguard-linux-compat/wireguard-linux-compat.hash
++++ b/package/wireguard-linux-compat/wireguard-linux-compat.hash
+@@ -1,4 +1,4 @@
+ # https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html
+-sha256  cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116  wireguard-linux-compat-1.0.20200413.tar.xz
++sha256  16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3  wireguard-linux-compat-1.0.20200520.tar.xz
+ # Locally calculated
+ sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk
+index 6d90245bd2..c6d79f59f9 100644
+--- a/package/wireguard-linux-compat/wireguard-linux-compat.mk
++++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413
++WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200520
+ WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot
+ WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz
+ WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0
+-- 
+2.17.1
+

buildroot/linux/linux.mk

@@ -408,6 +408,7 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_FB,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224,$(@D)/.config))
+	$(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config)
 endef
 
 ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y)
@@ -467,7 +468,10 @@ endif
 # '$(LINUX_TARGET_NAME)' targets separately because calling them in
 # the same $(MAKE) invocation has shown to cause parallel build
 # issues.
+# The call to disable gcc-plugins is a stop-gap measure:
+#   http://lists.busybox.net/pipermail/buildroot/2020-May/282727.html
 define LINUX_BUILD_CMDS
+	$(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS,$(@D)/.config)
 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
 	)

buildroot/package/linux-headers/Config.in.host

@@ -127,6 +127,10 @@ choice
 	  If your kernel headers are more recent than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7
+	bool "5.7.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4
 	bool "5.4.x or later"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4

buildroot/package/rpi-firmware/rpi-firmware.hash

@@ -1,3 +1,3 @@
 # Locally computed
-sha256 467cb4b93204210a47cf112d352d7e1090596c665f85fe54e9e36fd86642c5aa rpi-firmware-a6c9b6b48ce86ef2527586a50760d52f1b33f642.tar.gz
+sha256 4789d4422b3bc7eab157471ba36aebd54efc2a6de4c937f5cfdb4392af04fe80 rpi-firmware-7caead9416f64b2d33361c703fb243b8e157eba4.tar.gz
 sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom

buildroot/package/rpi-firmware/rpi-firmware.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = a6c9b6b48ce86ef2527586a50760d52f1b33f642
+RPI_FIRMWARE_VERSION = 7caead9416f64b2d33361c703fb243b8e157eba4
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

buildroot/package/wireguard-linux-compat/wireguard-linux-compat.hash

@@ -1,4 +1,4 @@
 # https://lists.zx2c4.com/pipermail/wireguard/2020-April/005296.html
-sha256  cf166348fbb67419528e73049ce001d29131aea367fa6aef9d3e223f7251e116  wireguard-linux-compat-1.0.20200413.tar.xz
+sha256  16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3  wireguard-linux-compat-1.0.20200520.tar.xz
 # Locally calculated
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING

buildroot/package/wireguard-linux-compat/wireguard-linux-compat.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200413
+WIREGUARD_LINUX_COMPAT_VERSION = 1.0.20200520
 WIREGUARD_LINUX_COMPAT_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot
 WIREGUARD_LINUX_COMPAT_SOURCE = wireguard-linux-compat-$(WIREGUARD_LINUX_COMPAT_VERSION).tar.xz
 WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0

buildroot/toolchain/Config.in

@@ -470,6 +470,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
 	select BR2_TOOLCHAIN_HEADERS_LATEST
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+
 # This should be selected by the latest version, above, to indicate that
 # Buildroot does not know of more recent headers than the ones selected.
 # This allows using toolchains with headers more recent than Buildroot
@@ -481,6 +485,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "5.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
 	default "5.4"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
 	default "5.3"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_3
 	default "5.2"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_2

buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options

@@ -115,6 +115,10 @@ choice
 	  If your toolchain uses headers newer than the latest version
 	  in the choice, then select the latest version.
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_7
+	bool "5.7.x or later"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_7
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4
 	bool "5.4.x or later"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4

scripts/update-kernel-odroid.sh

@@ -11,6 +11,6 @@ if [ -z "$2" ]; then
     exit 1
 fi
 
-sed -i "s|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/hardkernel/linux/.*\"|BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION=\"https://github.com/hardkernel/linux/archive/$1.tar.gz\"|g" buildroot-external/configs/*
+sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/odroid_*
 sed -i "s/| Odroid\(.*\) | .* |/| Odroid\1 | $2 |/g" Documentation/kernel.md
 git commit -m "Odroid: Update kernel $2 - $1" buildroot-external/configs/* Documentation/kernel.md

scripts/update-kernel-upstream.sh

@@ -6,6 +6,6 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/*
+sed -i "s/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\".*\"/BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE=\"$1\"/g" buildroot-external/configs/{intel_nuc,ova,tinker}_defconfig
 sed -i "s/| \(Open Virtual Applicance\|Intel NUC\|Tinker Board\) | .* |/| \1 | $1 |/g" Documentation/kernel.md
 git commit -m "Linux: Update kernel $1" buildroot-external/configs/* Documentation/kernel.md