Bump version 4.9

* Linux: Update kernel 5.4.44

* RaspberryPi: Update kernel 5.4.42 - 3d1e5203531fd1791762f018538e670bf10f722c

* RaspberryPi: Update firmware f382cc150445b3ef07de941e4877a5890d665aa7

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -9,17 +9,35 @@ 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 - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && 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/*
 
-# Build Tools
+# Build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev sudo \
-        git make g++ file perl bash binutils locales qemu-utils bison flex \
+        bash \
+        bc \
+        binutils \
+        build-essential \
+        bzip2 \
+        cpio \
+        file \
+        git \
+        make \
+        ncurses-dev \
+        patch \
+        perl \
+        python \
+        rsync \
+        sudo \
+        unzip \
+        wget \
+        qemu-utils \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry

Documentation/boards/tinker.md

@@ -5,11 +5,13 @@ Supported Hardware:
 | Device | Board | 
 |--------|-----------|
 | Tinker RK3288 | tinker |
-| Tinker S RK3288 | tinker |
+| Tinker S RK3288 |  |
 
+<!--
 ## eMMC
 
 eMMC support is provided transparently. Just flash the image to the eMMC by connecting your Tinker Board S to your PC via Micro-USB.
+-->
 
 ## Serial console
 

Documentation/configuration.md

@@ -3,7 +3,7 @@
 ## Automatic
 
 You can use an USB drive with HassOS to configure network options, SSH access to the host and to install updates.
-Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG` (in all capitals). Alternative you can create a `CONFIG` folder inside boot partition. Use the following directory structure within the USB drive:
+Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG` (in all capitals). Alternative you can create a `CONFIG` folder inside the `boot` partition. Use the following directory structure within the USB drive:
 
 ```text
 network/
@@ -24,7 +24,7 @@ hassos-xy.raucb
 - The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page.
 
 You can put this USB stick into the device and it will be read on startup and files written to the correct places. You can also trigger this process later over the
-API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be insterted to the device during this setup process and can be disconnected afterwards.*
+API/UI or by calling `systemctl restart hassos-config` on the host. *The USB Stick just needs to be inserted to the device during this setup process and can be disconnected afterwards.*
 
 ## Local
 
@@ -47,7 +47,9 @@ You can manual add, edit or remove connections configurations from `/etc/Network
 ### NTP
 
 You can manual edit the systemd timesync file on `/etc/systemd/timesyncd.conf`.
-Our default ntp configuration look like:
+
+Our default NTP configuration look like:
+
 ```
 [Time]
 NTP=time1.google.com time2.google.com time3.google.com

Documentation/development.md

@@ -3,33 +3,37 @@
 ## Boot system
 
 `BOOT_SYS`:
+
 - efi
-- hyprid
+- hybrid
 - mbr
 
-HassOS is basicly used GPT. But for use GPT we need own the first 1024 of
-boot drive. Is that not possible, you can use MBR for your device, they work also with SPLs.
+HassOS is using GPT. But to use GPT we need own the first 1024 of boot drive. Is that's not possible, you can use MBR for your device. This also work with SPLs.
 
-Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before.
+Hybrid and SPL use both a hybrid MBR/GPT table but SPL move the GPT header 8 MB for give space to write SPL and boot images before.
 
 `BOOT_SPL`:
+
 - true
 - false
 
 Enable SPL update handling.
 
 `BOOTLOADER`:
-- uboot
+
+- U-Boot
 - barebox
 
-We support mainly uboot but for uefi system we can also use barebox. In future we hope to remove barebox with uboot also on uefi.
+We support mainly U-Boot but for UEFI systems we can also use [barebox](https://barebox.org/). In the future, we hope to remove barebox with U-Boot also on UEFI.
 
 `DISK_SIZE`:
+
 Default 2. That is the size of end image in GB.
 
 ## Supervisor
 
 `SUPERVISOR_MACHINE`:
+
 - intel-nuc
 - odroid-c2
 - odroid-n2
@@ -46,7 +50,8 @@ Default 2. That is the size of end image in GB.
 - raspberrypi4-64
 - tinker
 
-`SUPERVISOR_ARCH`
+`SUPERVISOR_ARCH`:
+
 - amd64
 - i386
 - armhf

Documentation/getting_started_development.md

@@ -1,11 +1,10 @@
-Getting started with Hassos development using Docker on GNU/Linux
-=================================================================
+# Getting started with HassOS development using Docker on GNU/Linux
 
-First, install **docker-ce** for your distribution - I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a docker container - which requires a "privileged" container to run, which can only be done as root).
+First, install `docker-ce` for your distribution. I'd advise to use your distro's provided packages, since that will make sure permissions et al. are sanely set up for what you are about to run. You're also expected to have your current user properly set up in in your sudoers policy, so that this account may elevate to root and execute arbitrary commands as UID 0 (this is required, since at some point during the build process, a new loopback device-backed filesystem image will be mounted inside a Docker container - which requires a "privileged" container to run, which can only be done as root).
 
-Next, make sure the docker daemon is running:
+Next, make sure the Docker daemon is running:
 
-```
+```bash
 $ sudo systemctl status docker
 ● docker.service - Docker Application Container Engine
    Loaded: loaded (/usr/lib/systemd/system/docker.service; disabled; vendor preset: disabled)
@@ -15,7 +14,7 @@ $ sudo systemctl status docker
 
 My desktop distro doesn't start newly installed services by default, which means I'll have to manually fire up the `docker` service:
 
-```
+```bash
 $ sudo systemctl start docker
 $ sudo systemctl --no-pager status docker -n0
 ● docker.service - Docker Application Container Engine
@@ -30,9 +29,9 @@ $ sudo systemctl --no-pager status docker -n0
            └─1539 docker-containerd --config /var/run/docker/containerd/containerd.toml
 ```
 
-Now, change your working directory to your hassos repo checkout (please adapt pathnames as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
+Now, change your working directory to your home-assistant/operating-system repository checkout (please adapt path names as needed), make sure your intended changes to the source tree are applied (and committed, ideally :)), and execute the `enter.sh` helper script:
 
-```
+```bash
 $ cd ~/codebase/hassos/
 $ sudo scripts/enter.sh
 Sending build context to Docker daemon  30.48MB
@@ -43,24 +42,24 @@ Successfully built 4dc25a21556b
 Successfully tagged hassbuildroot:latest
 ```
 
-Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your docker container/build environment, where you can peek around:
+Note that the current iteration of `enter.sh` will try to load the **overlayfs** kernel module, which is not strictly required for Docker's operation, as far as I can tell. It's OK if loading that module fails; the shell script will continue executing. If everything works out, you will find yourself in an interactive login shell inside your Docker container/build environment, where you can peek around:
 
-```
+```bash
 root@somehashinhex:/build#
 root@somehashinhex:/build# make help
 [...]
 ```
 
-The _hassos_ developers provide a Makefile that will build hassos images for a (rather long!) list of targets. For example run the command below to start building the _ova_ variant, and go make a cup of tea. Or fifteen.
+The HassOS developers provide a `Makefile` that will build HassOS images for a list of targets. For example run the command below to start building the _ova_ variant, and go make a cup of tea. Or fifteen.
 
-```
+```bash
 root@0db6f7079872:/build# make ova
 [...]
 ```
 
 That will result in a single VMDK image file at the very end of the build process. This image file is a compressed block device dump with a proper GPT partition table, prepared to ship into any OVA-compatible hypervisor's innards. For me, the end of the **ova** build steps looks like this:
 
-```
+```bash
 [...]
 2097152+0 records out
 1073741824 bytes (1.1 GB, 1.0 GiB) copied, 12.2145 s, 87.9 MB/s
@@ -74,15 +73,15 @@ make: Leaving directory '/build/buildroot'
 
 The artifacts you just built are placed in the `target/` subdirectory:
 
-```
+```bash
 root@fd292c061896:/build# ls -lh release/
 total 141M
 -rw-r--r-- 1 root root 141M Oct 10 20:22 hassos_ova-2.2.vmdk.gz
 ```
 
-In order to be able to use this image file with the **qemu** hypervisor, you'll need to unpack it, and convert it to an image format that qemu can work with. Conveniently, the _hassos_ buildenv already provides all the tools we need for this conversion:
+In order to be able to use this image file with the QEMU hypervisor, you'll need to unpack it, and convert it to an image format that QEMU can work with. Conveniently, the HassOS buildenv already provides all the tools we need for this conversion:
 
-```
+```bash
 root@fd292c061896:/build# gunzip release/hassos_ova-2.2.qcow2.gz
 root@fd292c061896:/build# ls -lh release/
 total 673M
@@ -91,14 +90,12 @@ total 673M
 
 Now, exit the docker container's environment, and find the build artifacts in the `releases/` directory beneath your repository checkout dir. (The generated files will be owned by _root_; make sure to `chown` them to your user account, if needed.)
 
-From there, qemu can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my qemu virtual machine on, you'll need to install the **ovmf** package, which is described as providing "UEFI firmware for 64-bit x86 virtual machines". That package will install a _TianoCore_-derived qemu UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with qemu to boot the generated qcow2 image. (Please adapt pathnames as necessary, for example if you have installed the ovmf firmware image at another location.)
+From there, QEMU can try to boot it. Since the generated image assumes UEFI support in the host/hypervisor, this is slightly more tricky than with "classic"(/legacy) MBR-based images. On the *Debian* host I use to run my QEMU virtual machine on, you'll need to install the **ovmf** package which provides the "UEFI firmware for 64-bit x86 virtual machines". That package will install a **TianoCore**-derived QEMU UEFI image build at `/usr/share/OVMF/OVMF_CODE.fd`, which we'll use with QEMU to boot the generated qcow2 image. (Please adapt path names as necessary, for example if you have installed the ovmf firmware image at another location.)
 
-```
+```bash
 $ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive file=release/hassos_ova-2.2.qcow2,index=0,media=disk,if=ide,cache=none,format=qcow2 -drive file=/usr/share/ovmf/x64/OVMF_CODE.fd,if=pflash,format=raw,readonly=on
 ```
 
-This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader.
+This should pop up QEMU's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying additional options and flags to QEMU for network access, keyboard layout et al. are left as an exercise for the reader.
 
 After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS.
-
-Happy hacking! :)

Documentation/kernel.md

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

Documentation/network.md

@@ -1,15 +1,18 @@
 # Network
 
-## Configure Network
-HassOS uses NetworkManager to control the host network. In future releases, you will be able to set up the configuration using the API/UI. Currently only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
+HassOS uses NetworkManager to control the host network.
 
-## Configuration Examples
+## Configure network
 
-You can read the [Official Manual][keyfile] or find many configuration examples across the internet. The system is read-only, if you don't want the IP address to change on every boot, you should set the UUID property with a generic [UUID4][uuid]. Inside `\CONFIG\network\` on the USB or SD, create a file called `my-network` and add the appropriate contents below:
+Only a manual configuration using NetworkManager connection files is supported. Without a configuration file, the device will use DHCP by default. These network connection files can be placed on a USB drive and imported to the host as described in [Configuration][configuration-usb].
+
+## Configuration examples
+
+You can read the [NetworkManager manual][nm-manual] or find many configuration examples across the internet. Keep in mind that the system is read-only. If you don't want the IP address to change on every boot, you should modify the UUID property to a generic [UUID4][uuid]. Inside the `\CONFIG\network\` directory on the USB drive or SD card, create a file called `my-network` and add the appropriate contents below:
 
 ### Default
 
-We have a preinstalled connection profile:
+A preinstalled connection profile is provided by default:
 
 ```ini
 [connection]
@@ -25,7 +28,7 @@ addr-gen-mode=stable-privacy
 method=auto
 ```
 
-### LAN
+### Wired connection to the LAN
 
 ```ini
 [connection]
@@ -41,7 +44,7 @@ addr-gen-mode=stable-privacy
 method=auto
 ```
 
-### Wireless WPA/PSK
+### Wireless LAN WPA/PSK
 
 ```ini
 [connection]
@@ -78,7 +81,8 @@ method=manual
 address=192.168.1.111/24;192.168.1.1
 dns=8.8.8.8;8.8.4.4;
 ```
-For address, the value before the semicolon is the IP address and subnet prefix bitlength; the second value is the IP address of the gateway.
+
+For `address`, the value before the semicolon is the IP address and subnet prefix bitlength. The second value (after the semicolon) is the IP address of the local gateway.
 
 ## Tips
 
@@ -87,59 +91,63 @@ For address, the value before the semicolon is the IP address and subnet prefix
 If you want to reset the network configuration back to the default DHCP settings, use the following commands on the host:
 
 ```bash
-$ rm /etc/NetworkManager/system-connections/*
-$ cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
-$ nmcli con reload
+# rm /etc/NetworkManager/system-connections/*
+# cp /usr/share/system-connections/* /etc/NetworkManager/system-connections/
+# nmcli con reload
 ```
 
 ### Powersave
 
-If you have trouble with powersave you can do following:
+If you have trouble with powersave then apply the following changes:
 
 ```ini
 [wifi]
 # Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
 powersave=0
 ```
-## Using nmcli to set a static IPV4 address
 
-Log into the HASSOS base system via a console:
+## Using `nmcli` to set a static IPv4 address
 
-```
+Log into the the HassOS base system via a console:
+
+```bash
 Welcome to Home Assistant
 homeassistant login:
 ```
-Login as `root` (no password needed)
 
-At the `ha >` prompt, type `login` (as instructed).
+- Login as `root` (no password needed). At the `ha >` prompt, type `login` (as instructed).
 
-From here you will use the `nmcli` configuration tool.
+From there you use the `nmcli` configuration tool.
 
-`# nmcli connection show` will list the “HassOS default” connection in use.
+- `# nmcli con show` will list the "HassOS default" connection in use.
+- `# nmcli con show "HassOS default"` will list all the properties of the connection.
 
-`# nmcli con show "HassOS default"` will list all the properties of the connection.
+To start editing the configuration setting for "HassOS default":
 
-`# nmcli con edit "HassOS default"` will put you in a position to edit the connection.
-
-`nmcli> print ipv4` will show you the ipv4 properties of this connection.
+```bash
+# nmcli con edit "HassOS default"
+```
 
 To add your static IP address (select 'yes' for manual method);
-```
+
+```bash
 nmcli> set ipv4.addresses 192.168.100.10/24
 Do you also want to set 'ipv4.method' to 'manual'? [yes]:
 ```
-In addition I have found it is wise to set the dns server and the local gateway.  For most home routers these will be the same address.  If you are using Pi-Hole you can set the dns to that.
-```
+
+In addition, it's recommended to set the DNS server and the local gateway. For most home routers the DNS server will have the same IP address as the router itself. If you are using Pi-Hole or a third-party DNS system then you can set the DNS server to that.
+
+```bash
 nmcli> set ipv4.dns 192.168.100.1
 nmcli> set ipv4.gateway 192.168.100.1
-nmcli> save
-nmcli> quit
 ```
 
+`nmcli> print ipv4` will show you the IPv4 properties of this connection. With `nmcli> save` you will save the changes afterwards.
+
 If you now view the default connection `cat /etc/NetworkManager/system-connections/default` you should see the method is manual and the address is set.
 
-Doing a `nmcli con reload` does not always work so restart the VM.
+Doing a `nmcli con reload` does not always work, so restart the virtual machine or the physical system.
 
-[keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
+[nm-manual]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
 [configuration-usb]: configuration.md
 [uuid]: https://www.uuidgenerator.net/

Documentation/partition.md

@@ -1,12 +1,12 @@
 # Partition
 
-The partition layout is a bit different on the first part. We prefere GPT every time where is possible. With SoCs they don't support GPT, we can use the hyprid GPT. More about this on [development](development.mnd) documentation.
+The partition layout is a bit different than for regular setups. We prefer GPT, if possible. With SoCs which don't support GPT, we use the hybrid GPT. For more details about this topic, please refer to the [development](development.mnd) documentation.
 
-The system is designed to have less as possible writes on the system. Which means we have basicly just writes on the OTA update and pretty small (5-6 times per week) on the overlay part. The Data partition have real I/O which is possible to offload into a different drive.
+The system is designed to have as less as possible write operations on the storage media. Which means that we have basically only write during the OTA update and 5-6 times per week on the overlay part. The data partition is having I/O. This is the reason which is should be run on a different drive.
 
-Basic it look like:
+A visual representation looks like this:
 
-```
+```text
 -------------------------
 |       Bootloader      |
 -------------------------
@@ -36,11 +36,12 @@ Sometime the bootloader part can look different because there can be firmware or
 
 ## Data
 
-The data partation is the only partition with real I/O. It will be expanded automatic on boot time to the full size of the disk. 
+The data partition is the only partition with real I/O. It will be expanded automatic on boot time to the full size of the disk.
 
 This partition can be offloaded to a different drive with the utility:
+
 ```sh
 $ datactl move /dev/xxx
 ```
 
-On next boot, the partition will be moved to the new drive. The drive need to be bigger as the old one and we own the full new drive.
+On next boot, the partition will be moved to the new drive. The drive needs to be bigger as the old one and we own the full new drive.

README.md

@@ -1,15 +1,18 @@
-# Home Assistant Operating-System
-Hass.io OS based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of IoT hardware. It is also available as virtual appliance. The whole system is optimized for embedded system and  security. You can update the system simple with OTA updates or offline updates.
+# Home Assistant Operating system
 
-This is a embedded Linux which work different as a normal Linux distribution. The system is designed to run with less as possible I/O and full optimized for what is needed to be. Not more and not less. If you don't have expirence with embedded systems, that will be the point to go out of this repository. All docs are for developer with embedded background.
+Home Assistant Operating System (HassOS) is based on [buildroot](https://buildroot.org/). It's a hypervisor for Docker and supports various kind of hardware. It is also available as virtual appliance for different virtualization solutions. The whole system is optimized for hosting [Home Assistant](https://www.home-assistant.io) and its features (to be precise, the [Add-ons](https://www.home-assistant.io/addons/)). You can update the system by using OTA updates or offline updates.
+
+This is an embedded Linux which works different than a normal Linux distribution. The system is designed to run with minimal I/O and is optimized for its tasks.
+
+If you don't have experience with embedded systems, buildroot or the build process Linux distributions, then please read up on those topics. All provided documentation here is focusing on developers with a background on embedded systems or a strong understanding of the internal workings of operating systems.
 
 ## Focus
 
 - Barebox as bootloader on EFI
-- U-Boot as bootloader on IoT
+- U-Boot as bootloader
 - Linux/Buildroot LTS
 - RAUC for OTA updates
 - SquashFS LZ4 as filesystem
 - Docker-CE
 - AppArmor protected
-- ZRAM LZ4 for /tmp, /var, swap
+- ZRAM LZ4 for `/tmp`, `/var` and swap

buildroot-external/board/asus/tinker/uboot.config

@@ -1,3 +1,2 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
-CONFIG_DM_VIDEO=y

buildroot-external/board/hardkernel/odroid-c2/uboot.config

@@ -1,6 +1,3 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
-CONFIG_USB=y
-CONFIG_CMD_USB=y
-CONFIG_DM_USB=y

buildroot-external/board/hardkernel/odroid-xu4/uboot.config

@@ -1,4 +1,3 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
-CONFIG_DISPLAY_BOARDINFO=y

buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch

@@ -0,0 +1,169 @@
+From 85d231e8ec2ecda317fc8baebd12e84a26b42585 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Wed, 27 May 2020 13:23:49 +0000
+Subject: [PATCH 1/1] Revert ODROID-N2 thermal
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ .../boot/dts/amlogic/meson-g12-common.dtsi    | 57 -------------------
+ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 48 ----------------
+ 2 files changed, 105 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+index 03db48434aae..4b2021066c80 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+@@ -13,7 +13,6 @@
+ #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>
+ 
+ / {
+ 	interrupt-parent = <&gic>;
+@@ -129,61 +128,6 @@
+ 			status = "disabled";
+ 		};
+ 
+-		thermal-zones {
+-			cpu_thermal: cpu-thermal {
+-				polling-delay = <1000>;
+-				polling-delay-passive = <100>;
+-				thermal-sensors = <&cpu_temp>;
+-
+-				trips {
+-					cpu_passive: cpu-passive {
+-						temperature = <85000>; /* millicelsius */
+-						hysteresis = <2000>; /* millicelsius */
+-						type = "passive";
+-					};
+-
+-					cpu_hot: cpu-hot {
+-						temperature = <95000>; /* millicelsius */
+-						hysteresis = <2000>; /* millicelsius */
+-						type = "hot";
+-					};
+-
+-					cpu_critical: cpu-critical {
+-						temperature = <110000>; /* millicelsius */
+-						hysteresis = <2000>; /* millicelsius */
+-						type = "critical";
+-					};
+-				};
+-			};
+-
+-			ddr_thermal: ddr-thermal {
+-				polling-delay = <1000>;
+-				polling-delay-passive = <100>;
+-				thermal-sensors = <&ddr_temp>;
+-
+-				trips {
+-					ddr_passive: ddr-passive {
+-						temperature = <85000>; /* millicelsius */
+-						hysteresis = <2000>; /* millicelsius */
+-						type = "passive";
+-					};
+-
+-					ddr_critical: ddr-critical {
+-						temperature = <110000>; /* millicelsius */
+-						hysteresis = <2000>; /* millicelsius */
+-						type = "critical";
+-					};
+-				};
+-
+-				cooling-maps {
+-					map {
+-						trip = <&ddr_passive>;
+-						cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+-					};
+-				};
+-			};
+-		};
+-
+ 		ethmac: ethernet@ff3f0000 {
+ 			compatible = "amlogic,meson-axg-dwmac",
+ 				     "snps,dwmac-3.70a",
+@@ -2620,7 +2564,6 @@
+ 			assigned-clock-rates = <0>, /* Do Nothing */
+ 					       <800000000>,
+ 					       <0>; /* Do Nothing */
+-			#cooling-cells = <2>;
+ 		};
+ 	};
+ 
+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 7e0d2ce50066..1cf9af35e435 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts
+@@ -340,7 +340,6 @@
+ 	operating-points-v2 = <&cpu_opp_table_0>;
+ 	clocks = <&clkc CLKID_CPU_CLK>;
+ 	clock-latency = <50000>;
+-	#cooling-cells = <2>;
+ };
+ 
+ &cpu1 {
+@@ -355,7 +354,6 @@
+ 	operating-points-v2 = <&cpub_opp_table_1>;
+ 	clocks = <&clkc CLKID_CPUB_CLK>;
+ 	clock-latency = <50000>;
+-	#cooling-cells = <2>;
+ };
+ 
+ &cpu101 {
+@@ -379,52 +377,6 @@
+ 	clock-latency = <50000>;
+ };
+ 
+-&cpu_opp_table_0 {
+-	opp-1992000000 {
+-		opp-hz = /bits/ 64 <1992000000>;
+-		opp-microvolt = <1001000>;
+-	};
+-};
+-
+-&cpub_opp_table_1 {
+-	opp-1800000000 {
+-		opp-hz = /bits/ 64 <1800000000>;
+-		opp-microvolt = <981000>;
+-	};
+-
+-        opp-1908000000 {
+-                opp-hz = /bits/ 64 <1908000000>;
+-                opp-microvolt = <1022000>;
+-        };
+-
+-        opp-2016000000 {
+-                opp-hz = /bits/ 64 <2016000000>;
+-                opp-microvolt = <1022000>;
+-        };
+-};
+-
+-&cpu_thermal {
+-	trips {
+-		cpu_warm: cpu-warm {
+-			temperature = <70000>; /* millicelsius */
+-			hysteresis = <2000>; /* millicelsius */
+-			type = "passive";
+-		};
+-	};
+-	cooling-maps {
+-		cpufreq_map0 {
+-			trip = <&cpu_warm>;
+-			contribution = <1024>;
+-			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+-		};
+-		cpufreq_map1 {
+-			trip = <&cpu_warm>;
+-			contribution = <1024>;
+-			cooling-device = <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+-		};
+-	};
+-};
+-
+ &ext_mdio {
+ 	external_phy: ethernet-phy@0 {
+ 		/* Realtek RTL8211F (0x001cc916) */
+-- 
+2.17.1
+

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

@@ -20,7 +20,7 @@
       <Product>Operating-System</Product>
       <ProductUrl>https://home-assistant.io</ProductUrl>
     </ProductSection>
-    <OperatingSystemSection ovf:id="102" vmw:osType="otherLinux64Guest" ovf:required="false">
+    <OperatingSystemSection ovf:id="100" vmw:osType="other4xLinux64Guest">
       <Info>The kind of installed guest operating system</Info>
       <Description>Linux</Description>
     </OperatingSystemSection>
@@ -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,15 +1,56 @@
-From b8cabc02384390446cb7f2e34af07b44881246e3 Mon Sep 17 00:00:00 2001
+From ece9067567bf0cc938ff09e43dbb3cb00db7fb83 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Fri, 24 Apr 2020 22:03:34 +0000
+Date: Tue, 2 Jun 2020 21:20:08 +0000
 Subject: [PATCH 1/1] rpi-dts: allow uboot find serial
 
 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
+ arch/arm/boot/dts/bcm2711.dtsi | 8 ++++----
  arch/arm/boot/dts/bcm283x.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
+diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
+index 20114a723cf9..5bae25b20d81 100644
+--- a/arch/arm/boot/dts/bcm2711.dtsi
++++ b/arch/arm/boot/dts/bcm2711.dtsi
+@@ -128,7 +128,7 @@
+ 		};
+ 
+ 		uart2: serial@7e201400 {
+-			compatible = "arm,pl011", "arm,primecell";
++			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+ 			reg = <0x7e201400 0x200>;
+ 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&clocks BCM2835_CLOCK_UART>,
+@@ -139,7 +139,7 @@
+ 		};
+ 
+ 		uart3: serial@7e201600 {
+-			compatible = "arm,pl011", "arm,primecell";
++			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+ 			reg = <0x7e201600 0x200>;
+ 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&clocks BCM2835_CLOCK_UART>,
+@@ -150,7 +150,7 @@
+ 		};
+ 
+ 		uart4: serial@7e201800 {
+-			compatible = "arm,pl011", "arm,primecell";
++			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+ 			reg = <0x7e201800 0x200>;
+ 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&clocks BCM2835_CLOCK_UART>,
+@@ -161,7 +161,7 @@
+ 		};
+ 
+ 		uart5: serial@7e201a00 {
+-			compatible = "arm,pl011", "arm,primecell";
++			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+ 			reg = <0x7e201a00 0x200>;
+ 			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+ 			clocks = <&clocks BCM2835_CLOCK_UART>,
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 7e95601376d0..82a0ee0d5889 100644
+index 4426f9e6ba92..abcf677fe416 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -306,7 +306,7 @@

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.39"
+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
@@ -47,6 +47,7 @@ BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265=y
 BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y

buildroot-external/configs/odroid_c2_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/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_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/f2eb401e73e9b54432cf4234722cb4fad1b334f2.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
 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"
@@ -38,6 +38,7 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y

buildroot-external/configs/odroid_n2_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/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_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/40b58dcff55ee1046f6d69953b241ff27b92f749.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
 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"
@@ -38,6 +38,7 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y

buildroot-external/configs/odroid_xu4_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/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_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/f2eb401e73e9b54432cf4234722cb4fad1b334f2.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 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"
@@ -41,6 +41,7 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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.39"
+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
@@ -37,6 +37,7 @@ BR2_PACKAGE_JQ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_DT_UTILS=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -41,6 +41,7 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -40,6 +40,7 @@ BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y
@@ -96,5 +97,5 @@ 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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -41,6 +41,7 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -41,6 +41,7 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -42,6 +42,7 @@ BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -42,6 +42,7 @@ BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
 BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_WIFI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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/c41ae7cf543c1d680b4ac1afae40ca5bb0a96661.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3d1e5203531fd1791762f018538e670bf10f722c.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
@@ -40,6 +40,7 @@ BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=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.39"
+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"
@@ -42,6 +42,7 @@ BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_SQUASHFS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
+BR2_PACKAGE_CRDA=y
 BR2_PACKAGE_GPTFDISK=y
 BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_UBOOT_TOOLS=y

buildroot-external/meta

@@ -1,7 +1,7 @@
 VERSION_MAJOR=4
-VERSION_BUILD=6
+VERSION_BUILD=9
 
 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"
 
-DEPLOYMENT="staging"
+DEPLOYMENT="production"

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 - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && 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/patches/linux/0001-loop-Only-change-blocksize-when-needed.patch

@@ -0,0 +1,46 @@
+From 7e81f99afd91c937f0e66dc135e26c1c4f78b003 Mon Sep 17 00:00:00 2001
+From: Martijn Coenen <maco@android.com>
+Date: Tue, 10 Mar 2020 14:12:30 +0100
+Subject: [PATCH] loop: Only change blocksize when needed.
+
+Return early in loop_set_block_size() if the requested block size is
+identical to the one we already have; this avoids expensive calls to
+freeze the block queue.
+
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Martijn Coenen <maco@android.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ drivers/block/loop.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/block/loop.c b/drivers/block/loop.c
+index 739b372a5112..93b8d6047c14 100644
+--- a/drivers/block/loop.c
++++ b/drivers/block/loop.c
+@@ -1539,16 +1539,16 @@ static int loop_set_block_size(struct loop_device *lo, unsigned long arg)
+ 	if (arg < 512 || arg > PAGE_SIZE || !is_power_of_2(arg))
+ 		return -EINVAL;
+ 
+-	if (lo->lo_queue->limits.logical_block_size != arg) {
+-		sync_blockdev(lo->lo_device);
+-		kill_bdev(lo->lo_device);
+-	}
++	if (lo->lo_queue->limits.logical_block_size == arg)
++		return 0;
++
++	sync_blockdev(lo->lo_device);
++	kill_bdev(lo->lo_device);
+ 
+ 	blk_mq_freeze_queue(lo->lo_queue);
+ 
+ 	/* kill_bdev should have truncated all the pages */
+-	if (lo->lo_queue->limits.logical_block_size != arg &&
+-			lo->lo_device->bd_inode->i_mapping->nrpages) {
++	if (lo->lo_device->bd_inode->i_mapping->nrpages) {
+ 		err = -EAGAIN;
+ 		pr_warn("%s: loop%d (%s) has still dirty pages (nrpages=%lu)\n",
+ 			__func__, lo->lo_number, lo->lo_file_name,
+-- 
+2.17.1
+

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

@@ -21,6 +21,20 @@ OLD_DEVICE_CHILD="$(findfs LABEL="hassos-data")"
 OLD_DEVICE_ROOT="/dev/$(lsblk -no pkname "${OLD_DEVICE_CHILD}")"
 OLD_PART_NUM="${OLD_DEVICE_CHILD: -1}"
 
+# Wait for devices
+timeout 90 \
+    ash -c \
+        "until [ -e \"${NEW_DEVICE_ROOT}\" ]; do sleep 5; done" \
+            > /dev/null 2>&1 || true;
+
+# Check if block device is exists
+if [ ! -b "${NEW_DEVICE_ROOT}" ]; then
+    echo "[ERROR] No block device ${NEW_DEVICE_ROOT}!"
+    exit 1
+fi
+echo "[INFO] Cleanup device ${NEW_DEVICE_ROOT}!"
+sgdisk -Z "${NEW_DEVICE_ROOT}"
+
 # Create new partition
 echo "[INFO] Create new hassos-data partition"
 sgdisk -o "${NEW_DEVICE_ROOT}"
@@ -51,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
 
@@ -63,6 +77,7 @@ resize2fs -f "${NEW_DEVICE_CHILD}"
 
 # Fix partition layout
 partx -d "${OLD_DEVICE_CHILD}"
+partx -u "${OLD_DEVICE_ROOT}"
 partx -u "${NEW_DEVICE_ROOT}"
 
 echo "[INFO] Finish hassos data movement"

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

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

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 77ad450dd7cabb58ca04a18fd704844df6e642374346cf006a07edca46615af1 rpi-firmware-7eff9f6774bb43bfd61e749a0b45ffddc98c2311.tar.gz
++sha256 1c8e99d998b1e89c96bb6a1dd861884f568358db8792f2176dd6106ff7462f6b rpi-firmware-f382cc150445b3ef07de941e4877a5890d665aa7.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 = 7eff9f6774bb43bfd61e749a0b45ffddc98c2311
++RPI_FIRMWARE_VERSION = f382cc150445b3ef07de941e4877a5890d665aa7
  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/0007-docker-proxy-Bump-version.patch

@@ -0,0 +1,38 @@
+From aec12d6fc55c1c444ff9d226ec4748d27673c8a2 Mon Sep 17 00:00:00 2001
+From: Pascal Vizeli <pvizeli@syshack.ch>
+Date: Thu, 7 May 2020 09:02:05 +0000
+Subject: [PATCH 1/1] docker-proxy: Bump version
+
+Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
+---
+ package/docker-proxy/docker-proxy.hash | 2 +-
+ package/docker-proxy/docker-proxy.mk   | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash
+index 58de697929..1416db4042 100644
+--- a/package/docker-proxy/docker-proxy.hash
++++ b/package/docker-proxy/docker-proxy.hash
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256	866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d	docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
++sha256	2e1fdcc401a22d53103be6cfb5475c40af9f9a82a996ec6d508e0994dc2c5e4a	docker-proxy-1ea375d2b54d2e914e41970a04553ad55ef39b62.tar.gz
+ sha256  cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14	LICENSE
+diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
+index 8843266c30..1ab84159d1 100644
+--- a/package/docker-proxy/docker-proxy.mk
++++ b/package/docker-proxy/docker-proxy.mk
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+ 
+-DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e
+-DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
++DOCKER_PROXY_VERSION = 1ea375d2b54d2e914e41970a04553ad55ef39b62
++DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION))
+ 
+ DOCKER_PROXY_LICENSE = Apache-2.0
+ DOCKER_PROXY_LICENSE_FILES = LICENSE
+-- 
+2.17.1
+

buildroot/.br2-external.in.jpeg

@@ -1,5 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-# No br2-external tree defined.

buildroot/.br2-external.in.menus

@@ -1,5 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-# No br2-external tree defined.

buildroot/.br2-external.in.openssl

@@ -1,5 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-# No br2-external tree defined.

buildroot/.br2-external.in.paths

@@ -1,5 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-# No br2-external tree defined.

buildroot/.br2-external.in.toolchains

@@ -1,5 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-# No br2-external tree defined.

buildroot/.br2-external.mk

@@ -1,10 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-#
-
-BR2_EXTERNAL ?=
-BR2_EXTERNAL_NAMES = 
-BR2_EXTERNAL_DIRS = 
-BR2_EXTERNAL_MKS = 
-
-# No br2-external tree defined.

buildroot/CHANGES

@@ -1,3 +1,45 @@
+2020.02.2, released May 12th, 2020
+
+	Important / security related fixes.
+
+	Musl: Disallow on PPC64 cores without AltiVec support
+	(E.G. e5500).
+
+	fs/cpio: Correctly handle booting with 'console='
+
+	release: Ensure temporary .br2-external.* files are not
+	included in the release tarball
+
+	Defconfigs: Fix various mistyped config options, or config
+	options where the dependencies were no longer met.
+
+	Updated/fixed packages: apache, azure-iot-sdk-c, binutils,
+	boinc, c-ares, cvs, docker-cli, docker-containerd,
+	docker-engine, domoticz, e2fsprogs, efl, evtest, exim, ffmpeg,
+	freerdp, gcc, gflags, glibc, gnuconfig, haproxy, imx-gpu-2d,
+	irrlicht, jpeg kodi-pvr-vuplus, libarchive, libcoap,
+	libfpm-extra, libglib2, libhtp, libid3tag, libinput, libmad,
+	libopenssl, libsepol, libssh, libv4l, libvncserver, libwpe,
+	localedef, mariadb, matchbox, mbedtls, mc, mesa3d-headers,
+	meson, midori, msgpack, netsnmp, nginx, ogre, openjdk,
+	openldap, openvpn, p7zip, paho-mqtt-c, php, polkit, python,
+	python-attrs, python-crossbar, python-dpkt, python-flask,
+	python-future, python-iptables, python-jedi, python-markdown2,
+	python3, qemu, qpdf, qt5, samba4, squashfs, squid, strongswan,
+	suricata, tzdata, util-linux, vlc, wget, webkitgtk,
+	wireguard-linux-compat, wireshark, wpebackend-fdo, wpewebkit,
+	zic
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11866: initramfs file system fails to boot using Grub on EFI x86_64
+	#12271: python-iptables runtime dependencies
+	#12726: systemctl preset-all failed for ctrl-alt-del.target
+	#12751: OpenJdk package installation issues on target
+	#12796: Update OpenSSL to Version 1.1.1g to patch CVE-2020-1967
+	#12811: bootstrap stuck and no login prompt
+	#12841: util-linux/sfdisk 2.35.1 fails on sector-size header
+
 2020.02.1, released April 10th, 2020
 
 	Important / security related fixes.

buildroot/DEVELOPERS

@@ -484,18 +484,12 @@ F:	package/sunxi-boards/
 
 N:	Carlos Santos <unixmania@gmail.com>
 F:	package/busybox/
-F:	package/cups/
-F:	package/cups-filters/
-F:	package/gtest/
 F:	package/initscripts/
 F:	package/intel-microcode/
-F:	package/libpam-radius-auth/
-F:	package/libpam-tacplus/
 F:	package/liburiparser/
 F:	package/modem-manager/
 F:	package/pamtester/
 F:	package/pcm-tools/
-F:	package/perl-file-util/
 F:	package/skeleton-custom/
 F:	package/skeleton-init-common/
 F:	package/skeleton-init-none/
@@ -676,7 +670,7 @@ F:	linux/linux-ext-ev3dev-linux-drivers.mk
 F:	package/brickd/
 F:	package/ev3dev-linux-drivers/
 
-N:	Davide Viti <zinosat@tiscali.it>
+N:	Davide Viti <zinosat@gmail.com>
 F:	package/flann/
 F:	package/python-paho-mqtt/
 F:	package/qhull/
@@ -2090,9 +2084,6 @@ F:	package/libfreeimage/
 N:	Renaud Aubin <root@renaud.io>
 F:	package/libhttpparser/
 
-N:	Rhys Williams <github@wilberforce.co.nz>
-F:	package/lirc-tools/
-
 N:	Ricardo Martincoski <ricardo.martincoski@datacom.com.br>
 F:	package/atop/
 F:	package/thermald/

buildroot/Makefile

@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2020.02.1
+export BR2_VERSION := 2020.02.2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1586551000
+BR2_VERSION_EPOCH = 1589285000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -1189,7 +1189,7 @@ release: OUT = buildroot-$(BR2_VERSION)
 release:
 	git archive --format=tar --prefix=$(OUT)/ HEAD > $(OUT).tar
 	$(MAKE) O=$(OUT) manual-html manual-text manual-pdf
-	$(MAKE) O=$(OUT) clean
+	$(MAKE) O=$(OUT) distclean
 	tar rf $(OUT).tar $(OUT)
 	gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
 	bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2

buildroot/board/hardkernel/odroidc2/boot.ini

@@ -1,176 +0,0 @@
-ODROIDC2-UBOOT-CONFIG
-
-########################################################################
-# Changes made to this are overwritten every time there's a new upgrade
-# To make your changes permanent change it on 
-# boot.ini.default
-# After changing it on boot.ini.default run the bootini command to
-# rewrite this file with your personal permanent settings.
-# Documentation: http://odroid.com/dokuwiki/doku.php?id=en:c2_persistent_bootini
-########################################################################
-
-# Possible screen resolutions
-# Uncomment only a single Line! The line with setenv written.
-# At least one mode must be selected.
-
-# Custom modeline!
-# To use custom modeline you need to disable all the below resolutions
-# and setup your own! 
-# For more information check our wiki: 
-# http://odroid.com/dokuwiki/doku.php?id=en:c2_hdmi_autosetting
-# Example below:
-# setenv m "custombuilt" 
-# setenv modeline "1920,1200,154000,74040,60,1920,1968,2000,2080,1200,1202,1208,1235,1,0,1"
-
-# 480 Lines (720x480)
-# setenv m "480i60hz" # Interlaced 60Hz
-# setenv m "480i_rpt" # Interlaced for Rear Projection Televisions 60Hz
-# setenv m "480p60hz" # 480 Progressive 60Hz
-# setenv m "480p_rpt" # 480 Progressive for Rear Projection Televisions 60Hz
-
-# 576 Lines (720x576)
-# setenv m "576i50hz" # Interlaced 50Hz
-# setenv m "576i_rpt" # Interlaced for Rear Projection Televisions 50Hz
-# setenv m "576p50hz" # Progressive 50Hz
-# setenv m "576p_rpt" # Progressive for Rear Projection Televisions 50Hz
-
-# 720 Lines (1280x720)
-# setenv m "720p50hz" # 50Hz
-# setenv m "720p60hz" # 60Hz
-
-# 1080 Lines (1920x1080)
-# setenv m "1080i60hz" # Interlaced 60Hz
-setenv m "1080p60hz" # Progressive 60Hz
-# setenv m "1080i50hz" # Interlaced 50Hz
-# setenv m "1080p50hz" # Progressive 50Hz
-# setenv m "1080p24hz" # Progressive 24Hz
-
-# 4K (3840x2160)
-# setenv m "2160p30hz"    # Progressive 30Hz
-# setenv m "2160p25hz"    # Progressive 25Hz
-# setenv m "2160p24hz"    # Progressive 24Hz
-# setenv m "smpte24hz"    # Progressive 24Hz SMPTE
-# setenv m "2160p50hz"    # Progressive 50Hz
-# setenv m "2160p60hz"    # Progressive 60Hz
-# setenv m "2160p50hz420" # Progressive 50Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it)
-# setenv m "2160p60hz420" # Progressive 60Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it)
-
-### VESA modes ###
-# setenv m "640x480p60hz"
-# setenv m "800x480p60hz"
-# setenv m "480x800p60hz"
-# setenv m "800x600p60hz"
-# setenv m "1024x600p60hz"
-# setenv m "1024x768p60hz"  
-# setenv m "1280x800p60hz"
-# setenv m "1280x1024p60hz"
-# setenv m "1360x768p60hz"
-# setenv m "1440x900p60hz"
-# setenv m "1600x900p60hz"
-# setenv m "1680x1050p60hz"
-# setenv m "1600x1200p60hz"
-# setenv m "1920x1200p60hz"
-# setenv m "2560x1080p60hz"
-# setenv m "2560x1440p60hz"
-# setenv m "2560x1600p60hz"
-# setenv m "3440x1440p60hz"
-
-# HDMI BPP Mode
-setenv m_bpp "32"
-# setenv m_bpp "24"
-# setenv m_bpp "16"
-
-# HDMI DVI/VGA modes
-# By default its set to HDMI, if needed change below.
-# Uncomment only a single Line.
-# setenv vout "dvi"
-# setenv vout "vga"
-
-# HDMI HotPlug Detection control
-# Allows you to force HDMI thinking that the cable is connected.
-# true = HDMI will believe that cable is always connected
-# false = will let board/monitor negotiate the connection status
-setenv hpd "true"
-# setenv hpd "false"
-
-# Monitor output
-# Controls if HDMI PHY should output anything to the monitor
-setenv monitor_onoff "false" # true or false
-
-# Server Mode (aka. No Graphics)
-# Setting nographics to 1 will disable all video subsystem
-# This mode is ideal of server type usage. (Saves ~300Mb of RAM)
-setenv nographics "0"
-
-# Meson Timer
-# 1 - Meson Timer
-# 0 - Arch Timer 
-# Using meson_timer improves the video playback however it breaks KVM (virtualization).
-# Using arch timer allows KVM/Virtualization to work however you'll experience poor video
-setenv mesontimer "1"
-
-# UHS (Ultra High Speed) MicroSD mode enable/disable
-setenv disableuhs "false"
-
-# MicroSD Card Detection enable/disable
-# Force the MMC controlled to believe that a card is connected.
-setenv mmc_removable "true"
-
-# USB Multi WebCam tweak
-# Only enable this if you use it.
-setenv usbmulticam "false"
-
-# Default Console Device Setting
-setenv condev "console=ttyS0,115200n8 console=tty0"   # on both
-
-# CPU Frequency / Cores control
-###########################################
-### WARNING!!! WARNING!!! WARNING!!!
-# Before changing anything here please read the wiki entry: 
-# http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq
-#
-# MAX CPU's
-# setenv maxcpus "1"
-# setenv maxcpus "2"
-# setenv maxcpus "3"
-setenv maxcpus "4"
-
-# MAX Frequency
-# setenv max_freq "2016"  # 2.016GHz
-# setenv max_freq "1944"  # 1.944GHz
-# setenv max_freq "1944"  # 1.944GHz
-# setenv max_freq "1920"  # 1.920GHz
-# setenv max_freq "1896"  # 1.896GHz
-# setenv max_freq "1752"  # 1.752GHz
-# setenv max_freq "1680"  # 1.680GHz
-# setenv max_freq "1656"  # 1.656GHz
-setenv max_freq "1536"  # 1.536GHz
-
-
-
-###########################################
-
-# Boot Arguments
-if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
-
-setenv bootargs "root=/dev/mmcblk0p2 rootwait ro ${condev} no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes net.ifnames=0 elevator=noop disablehpd=${hpd} max_freq=${max_freq} maxcpus=${maxcpus} monitor_onoff=${monitor_onoff} disableuhs=${disableuhs} mmc_removable=${mmc_removable} usbmulticam=${usbmulticam}"
-
-# Booting
-
-setenv loadaddr "0x11000000"
-setenv dtb_loadaddr "0x1000000"
-setenv initrd_loadaddr "0x13000000"
-
-fatload mmc 0:1 ${loadaddr} Image
-fatload mmc 0:1 ${dtb_loadaddr} meson64_odroidc2.dtb
-fdt addr ${dtb_loadaddr}
-
-if test "${mesontimer}" = "0"; then fdt rm /meson_timer; fdt rm /cpus/cpu@0/timer; fdt rm /cpus/cpu@1/timer; fdt rm /cpus/cpu@2/timer; fdt rm /cpus/cpu@3/timer; fi
-if test "${mesontimer}" = "1"; then fdt rm /timer; fi
-
-if test "${nographics}" = "1"; then fdt rm /reserved-memory; fdt rm /aocec; fi
-if test "${nographics}" = "1"; then fdt rm /meson-fb; fdt rm /amhdmitx; fdt rm /picdec; fdt rm /ppmgr; fi
-if test "${nographics}" = "1"; then fdt rm /meson-vout; fdt rm /mesonstream; fdt rm /meson-fb; fi
-if test "${nographics}" = "1"; then fdt rm /deinterlace; fdt rm /codec_mm; fi
-
-booti ${loadaddr} - ${dtb_loadaddr}

buildroot/board/hardkernel/odroidc2/genimage.cfg

@@ -1,27 +0,0 @@
-image boot.vfat {
-	vfat {
-		files = {
-			"boot.ini",
-			"Image",
-			"meson64_odroidc2.dtb"
-		}
-	}
-	size = 32M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition vfat {
-		partition-type = 0xC
-		image = "boot.vfat"
-		offset = 1048576
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-		size = 512M
-	}
-}

buildroot/board/hardkernel/odroidc2/post-image.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-cp ${BOARD_DIR}/boot.ini ${BINARIES_DIR}/
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                           \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
-
-dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=1 count=442 conv=sync,notrunc
-dd if=${BINARIES_DIR}/u-boot.bin of=${BINARIES_DIR}/sdcard.img bs=512 skip=1 seek=1 conv=fsync,notrunc

buildroot/board/hardkernel/odroidc2/readme.txt

@@ -1,53 +0,0 @@
-ODROID-C2
-
-Intro
-=====
-To be able to use ODROID-C2 board with the images generated by
-Buildroot, you have to prepare the SDCard or eMMC.
-
-How to build it
-===============
-
-  $ make odroidc2_defconfig
-
-Then you can edit the build options using
-
-  $ make menuconfig
-
-Compile all and build rootfs image:
-
-  $ make
-
-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
-
-Result of the build
--------------------
-
-After building, you should obtain this tree:
-
-    output/images/
-    +-- Image
-    +-- boot.ini                   [1]
-    +-- boot.vfat
-    +-- meson64_odroidc2.dtb
-    +-- rootfs.ext2
-    +-- rootfs.ext4
-    +-- rootfs.tar
-    +-- sdcard.img
-    `-- u-boot.bin
-
-[1] This is the ODROID-C2 configuration file used in u-boot.
-
-How to write the SD card or eMMC
-================================
-
-Once the build process is finished you will have an image called "sdcard.img"
-in the output/images/ directory.
-
-Copy the bootable "sdcard.img" onto an SD card or eMMC with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
-
-Insert the SDcard into your ODROID-C2, and power it up. Your new system
-should come up now.

buildroot/board/solidrun/mx6cubox/post-build.sh

@@ -2,7 +2,7 @@
 
 BOARD_DIR="$(dirname $0)"
 
-$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
--n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
+install -d -m 755 $TARGET_DIR/boot
 
-install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
+	-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr

buildroot/board/udoo/neo/post-build.sh

@@ -2,7 +2,6 @@
 
 BOARD_DIR="$(dirname $0)"
 
+install -d -m 755 $TARGET_DIR/boot
 $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
--n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
-
-install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
+	-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr

buildroot/board/wandboard/post-build.sh

@@ -2,7 +2,7 @@
 
 BOARD_DIR="$(dirname $0)"
 
-$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
--n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
+install -d -m 755 $TARGET_DIR/boot
 
-install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
+	-n "boot script" -d $BOARD_DIR/boot.scr.txt $TARGET_DIR/boot/boot.scr

buildroot/configs/amarula_a64_relic_defconfig

@@ -40,6 +40,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Amarula A64-Relic"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_ANDROID_TOOLS=y
 BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y

buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig

@@ -9,6 +9,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
@@ -51,7 +52,6 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # qt5
 BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
 BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
 BR2_PACKAGE_QT5BASE_LINUXFB=y
 BR2_PACKAGE_QT5BASE_FONTCONFIG=y

buildroot/configs/freescale_imx28evk_defconfig

@@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_FORMAT_SD=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT4=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 
 # To generate SD Image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y

buildroot/configs/imx23evk_defconfig

@@ -25,7 +25,7 @@ BR2_TARGET_UBOOT_FORMAT_SD=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT4=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 
 # To generate SD card image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y

buildroot/configs/imx6-sabresd_qt5_defconfig

@@ -68,7 +68,6 @@ BR2_PACKAGE_MESA3D_DEMOS=y
 
 # Qt5
 BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
 BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
 BR2_PACKAGE_QT5BASE_LINUXFB=y
 BR2_PACKAGE_QT5BASE_FONTCONFIG=y

buildroot/configs/minnowboard_max-graphical_defconfig

@@ -42,6 +42,7 @@ BR2_PACKAGE_MESA3D_DEMOS=y
 BR2_PACKAGE_MESA3D=y
 BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y
 BR2_PACKAGE_MESA3D_DRI_DRIVER_I965=y
+BR2_PACKAGE_MESA3D_OPENGL_GLX=y
 
 # Framebuffer (just for testing purposes)
 BR2_PACKAGE_FB_TEST_APP=y

buildroot/configs/olimex_a20_olinuxino_lime2_defconfig

@@ -6,6 +6,10 @@ BR2_ARM_EABIHF=y
 # Linux headers same as kernel, a 5.4 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
+# Toolchain
+# glibc is needed for sunxi-mali-mainline-package.
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
 BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"

buildroot/configs/olimex_a20_olinuxino_lime_defconfig

@@ -6,6 +6,10 @@ BR2_ARM_EABIHF=y
 # Linux headers same as kernel, a 5.4 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
+# Toolchain
+# glibc is needed for sunxi-mali-mainline-package.
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
 BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"

buildroot/configs/olimex_imx233_olinuxino_defconfig

@@ -33,7 +33,7 @@ BR2_PACKAGE_ZD1211_FIRMWARE=y
 
 # Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT4=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
 # U-Boot

buildroot/configs/qemu_ppc_virtex_ml507_defconfig

@@ -10,7 +10,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 
 # Use soft float
-BR2_SOFT_FLOAT=y
+BR2_POWERPC_SOFT_FLOAT=y
 
 # Kernel
 BR2_LINUX_KERNEL=y

buildroot/configs/qemu_riscv32_virt_defconfig

@@ -23,7 +23,6 @@ BR2_LINUX_KERNEL_IMAGE=y
 
 # Bootloader
 BR2_TARGET_OPENSBI=y
-BR2_TARGET_OPENSBI_USE_PLAT=y
 BR2_TARGET_OPENSBI_PLAT="qemu/virt"
 
 # host-qemu for gitlab testing

buildroot/configs/qemu_riscv64_virt_defconfig

@@ -22,7 +22,6 @@ BR2_LINUX_KERNEL_IMAGE=y
 
 # Bootloader
 BR2_TARGET_OPENSBI=y
-BR2_TARGET_OPENSBI_USE_PLAT=y
 BR2_TARGET_OPENSBI_PLAT="qemu/virt"
 
 # host-qemu for gitlab testing

buildroot/docs/manual/adding-packages-python.txt

@@ -98,10 +98,9 @@ Note that:
    dependencies are automatically added as needed by the Python
    package infrastructure.
 
- * Similarly, it is not needed to add +host-setuptools+ and/or
-   +host-distutilscross+ dependencies to +PYTHON_FOO_DEPENDENCIES+ for
-   setuptools-based packages, since these are automatically added by
-   the Python infrastructure as needed.
+ * Similarly, it is not needed to add +host-setuptools+ to
+   +PYTHON_FOO_DEPENDENCIES+ for setuptools-based packages, since it's
+   automatically added by the Python infrastructure as needed.
 
 One variable specific to the Python infrastructure is mandatory:
 

buildroot/docs/manual/manual.text

@@ -163,13 +163,13 @@ List of Examples
 
 ---------------------------------------------------------------------
 
-Buildroot 2020.02.1 manual generated on 2020-04-10 20:45:00 UTC from
-git revision 80e565bbeb
+Buildroot 2020.02.2 manual generated on 2020-05-12 12:18:45 UTC from
+git revision 2f7183d131
 
 The Buildroot manual is written by the Buildroot developers. It is
 licensed under the GNU General Public License, version 2. Refer to
 the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
-80e565bbebc61bf113bcd3b3475fa27a5127f466] file in the Buildroot
+2f7183d13133f2ded97fee273bd0cbed10226e4e] file in the Buildroot
 sources for the full text of this license.
 
 Copyright © 2004-2020 The Buildroot developers
@@ -5167,10 +5167,9 @@ Note that:
     PYTHON_FOO_DEPENDENCIES variable of a package, since these basic
     dependencies are automatically added as needed by the Python
     package infrastructure.
-  * Similarly, it is not needed to add host-setuptools and/or
-    host-distutilscross dependencies to PYTHON_FOO_DEPENDENCIES for
-    setuptools-based packages, since these are automatically added by
-    the Python infrastructure as needed.
+  * Similarly, it is not needed to add host-setuptools to
+    PYTHON_FOO_DEPENDENCIES for setuptools-based packages, since it’s
+    automatically added by the Python infrastructure as needed.
 
 One variable specific to the Python infrastructure is mandatory:
 

buildroot/fs/cpio/init

@@ -1,7 +1,4 @@
 #!/bin/sh
 # devtmpfs does not get automounted for initramfs
 /bin/mount -t devtmpfs devtmpfs /dev
-exec 0</dev/console
-exec 1>/dev/console
-exec 2>/dev/console
 exec /sbin/init "$@"

buildroot/linux/Config.in

@@ -30,7 +30,7 @@ config BR2_LINUX_KERNEL_LATEST_VERSION
 	bool "Latest version (5.4)"
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	bool "Latest CIP SLTS version (4.19.98-cip19)"
+	bool "Latest CIP SLTS version (4.19.118-cip25)"
 	help
 	  CIP launched in the spring of 2016 to address the needs of
 	  organizations in industries such as power generation and
@@ -49,7 +49,7 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	  https://www.cip-project.org
 
 config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
-	bool "Latest CIP RT SLTS version (4.19.98-cip19-rt7)"
+	bool "Latest CIP RT SLTS version (4.19.115-cip24-rt9)"
 	help
 	  Same as the CIP version, but this is the PREEMPT_RT realtime
 	  variant.
@@ -128,9 +128,9 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.4.31" if BR2_LINUX_KERNEL_LATEST_VERSION
-	default "4.19.98-cip19" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	default "4.19.98-cip19-rt7" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
+	default "5.4.40" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.19.118-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	default "4.19.115-cip24-rt9" 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

buildroot/linux/linux.hash

@@ -1,13 +1,13 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  a11083f8f809887f6a0f8d4467532385b99418f17998fe6e837807491c276eeb  linux-5.4.31.tar.xz
+sha256  83563f027687ecaafb41d0d2d52056f40ec9822f8a9e43592e215349730020ab  linux-5.4.40.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  ea68cb8e9fa255bb1d0402c5aa8f26984f9b1c8607ff3bed5d3284109167f063  linux-4.4.218.tar.xz
-sha256  df3a6e615ec4c57b04775e9c018c67045223ac662e696d28fd37baa5114349cd  linux-4.9.218.tar.xz
-sha256  cb440ac5d20071dcb482e5062958514064b0c5a8375c92653062ea201ae0222c  linux-4.14.175.tar.xz
-sha256  1e40a0dc6afc95a259f97b80d5f5ef8f89e2ee49e993ba6844e2bc55de361f0e  linux-4.19.114.tar.xz
+sha256  cd963e66d7fb07f142fa5274ec90f46c8388a327e2ba28c5fec245d734b0d425  linux-4.4.223.tar.xz
+sha256  cf5300e6f5d8c66c2bed8f00d53f9c58103731809862427012e4010f5d782ae5  linux-4.9.223.tar.xz
+sha256  444ef973d9b6a6ea174e4a9086f0aea980d8575d13302e431ad688f22e27ed0e  linux-4.14.180.tar.xz
+sha256  5050268ec5cf003d96366d1611ecfa4ab6974125d6fa26cea1ccb81dd4df00a5  linux-4.19.122.tar.xz
 # Locally computed
-sha256  18f9ddba0b777d1942d6c81877ba97c4bcd08488e2c409e57dcce866b9de5fc2  linux-cip-4.19.98-cip19.tar.gz
-sha256  7d5aeb67da41dc66ef28621ef994ef4403e8b1f5c3df38b1843da20972444280  linux-cip-4.19.98-cip19-rt7.tar.gz
+sha256  ea53913813cb5a9069608532b327de7a7ed0fdc8fed8c6f10cd55d1ac6a58ffb  linux-cip-4.19.118-cip25.tar.gz
+sha256  7f0a0db0e1cfb14053523f4432f1ad1468b5bd42305b44905c4b103466c8d655  linux-cip-4.19.115-cip24-rt9.tar.gz
 
 # Licenses hashes
 sha256  ee5808b032a67f587d3541099d46de34f5bec8cd5976114ba07f1299ee6001ff  COPYING

buildroot/package/apache/0004-server-log.c-ap_log_pid-Use-a-temporary-file-then-re.patch

@@ -0,0 +1,77 @@
+From 5b95d256387b45fbe33f7ee7890ae35afdd5c371 Mon Sep 17 00:00:00 2001
+From: Joe Orton <jorton@apache.org>
+Date: Fri, 13 Mar 2020 14:34:18 +0000
+Subject: [PATCH] * server/log.c (ap_log_pid): Use a temporary file, then
+ rename once   successfully written; also add error checking.  Avoids startup 
+  failures if a previous httpd invocation crashed while writing the   pidfile.
+
+Submitted by: Nicolas Carrier <carrier.nicolas0 gmail.com>, jorton
+Github: closes #100, closes #69
+PR: 63140
+
+git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875153 13f79535-47bb-0310-9956-ffa450edef68
+Signed-off-by: Nicolas Carrier <nicolas.carrier@orolia.com>
+---
+ server/log.c | 33 ++++++++++++++++++++++++++-------
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+diff --git a/server/log.c b/server/log.c
+index f0bde6e4b8..8d54b4e057 100644
+--- a/server/log.c
++++ b/server/log.c
+@@ -1598,6 +1598,9 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename)
+     pid_t mypid;
+     apr_status_t rv;
+     const char *fname;
++    char *temp_fname;
++    apr_fileperms_t perms;
++    char pidstr[64];
+ 
+     if (!filename) {
+         return;
+@@ -1626,19 +1629,35 @@ AP_DECLARE(void) ap_log_pid(apr_pool_t *p, const char *filename)
+                       fname);
+     }
+ 
+-    if ((rv = apr_file_open(&pid_file, fname,
+-                            APR_WRITE | APR_CREATE | APR_TRUNCATE,
+-                            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p))
+-        != APR_SUCCESS) {
++    temp_fname = apr_pstrcat(p, fname, ".XXXXXX", NULL);
++    rv = apr_file_mktemp(&pid_file, temp_fname,
++                         APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_TRUNCATE, p);
++    if (rv != APR_SUCCESS) {
+         ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(00099)
+-                     "could not create %s", fname);
++                     "could not create %s", temp_fname);
+         ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, APLOGNO(00100)
+                      "%s: could not log pid to file %s",
+                      ap_server_argv0, fname);
+         exit(1);
+     }
+-    apr_file_printf(pid_file, "%" APR_PID_T_FMT APR_EOL_STR, mypid);
+-    apr_file_close(pid_file);
++
++    apr_snprintf(pidstr, sizeof pidstr, "%" APR_PID_T_FMT APR_EOL_STR, mypid);
++
++    perms = APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD;
++    rv = apr_file_perms_set(temp_fname, perms);    
++    if (rv == APR_SUCCESS)
++        rv = apr_file_write_full(pid_file, pidstr, strlen(pidstr), NULL);
++    if (rv == APR_SUCCESS)
++        rv = apr_file_close(pid_file);
++    if (rv == APR_SUCCESS)
++        rv = apr_file_rename(temp_fname, fname, p);
++    if (rv != APR_SUCCESS) {
++        ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, APLOGNO(10231)
++                     "%s: Failed creating pid file %s",
++                     ap_server_argv0, temp_fname);
++        exit(1);
++    }
++
+     saved_pid = mypid;
+ }
+ 
+-- 
+2.25.2
+

buildroot/package/apache/apache.hash

@@ -1,4 +1,4 @@
-# From http://archive.apache.org/dist/httpd/httpd-2.4.41.tar.bz2.sha256
-sha256 133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 httpd-2.4.41.tar.bz2
+# From http://archive.apache.org/dist/httpd/httpd-2.4.43.tar.bz2.sha256
+sha256  a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43  httpd-2.4.43.tar.bz2
 # Locally computed
-sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE
+sha256  47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43  LICENSE

buildroot/package/apache/apache.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APACHE_VERSION = 2.4.41
+APACHE_VERSION = 2.4.43
 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
 APACHE_SITE = http://archive.apache.org/dist/httpd
 APACHE_LICENSE = Apache-2.0
@@ -99,6 +99,7 @@ APACHE_CONF_OPTS += --disable-deflate
 endif
 
 define APACHE_FIX_STAGING_APACHE_CONFIG
+	$(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs
 	$(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs
 	$(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk
 endef

buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk

@@ -17,35 +17,55 @@ AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON
 # The project only supports building one kind of library.
 # Further the install target installs the wrong files, so we do it here:
 ifeq ($(BR2_STATIC_LIBS),y)
-AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.a c-utility/libaziotsharedutil.a \
-	iothub_client/libiothub_client.a iothub_client/libiothub_client_mqtt_ws_transport.a \
+AZURE_IOT_SDK_C_LIBS += \
+	uamqp/libuamqp.a \
+	c-utility/libaziotsharedutil.a \
+	iothub_client/libiothub_client.a \
+	iothub_client/libiothub_client_mqtt_ws_transport.a \
 	iothub_client/libiothub_client_amqp_ws_transport.a \
 	iothub_client/libiothub_client_http_transport.a \
 	iothub_client/libiothub_client_amqp_transport.a \
 	iothub_client/libiothub_client_mqtt_transport.a \
-	iothub_service_client/libiothub_service_client.a serializer/libserializer.a umqtt/libumqtt.a
+	iothub_service_client/libiothub_service_client.a \
+	serializer/libserializer.a \
+	umqtt/libumqtt.a \
+	libparson.a
 else
-AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.so c-utility/libaziotsharedutil.so \
-	iothub_client/libiothub_client.so iothub_client/libiothub_client_mqtt_ws_transport.so \
+AZURE_IOT_SDK_C_LIBS += \
+	uamqp/libuamqp.so \
+	c-utility/libaziotsharedutil.so \
+	iothub_client/libiothub_client.so \
+	iothub_client/libiothub_client_mqtt_ws_transport.so \
 	iothub_client/libiothub_client_amqp_ws_transport.so \
 	iothub_client/libiothub_client_http_transport.so \
 	iothub_client/libiothub_client_amqp_transport.so \
 	iothub_client/libiothub_client_mqtt_transport.so \
-	iothub_service_client/libiothub_service_client.so serializer/libserializer.so umqtt/libumqtt.so
+	iothub_service_client/libiothub_service_client.so \
+	serializer/libserializer.so \
+	umqtt/libumqtt.so.1.1.11 \
+	libparson.so
+
+define AZURE_IOT_SDK_C_CREATE_SYMLINKS
+	ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so.1
+	ln -sf libumqtt.so.1.1.11 $(1)/usr/lib/libumqtt.so
+endef
 endif
 
-define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS
+define AZURE_IOT_SDK_C_INSTALL_LIBS
 	$(foreach l,$(AZURE_IOT_SDK_C_LIBS), \
-		$(INSTALL) -D -m 0755 $(@D)/$(l) $(STAGING_DIR)/usr/lib/
+		$(INSTALL) -D -m 0755 $(@D)/$(l) $(1)/usr/lib/$(notdir $(l))
 	)
+	$(call AZURE_IOT_SDK_C_CREATE_SYMLINKS,$(1))
+endef
+
+define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS
+	$(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(STAGING_DIR))
 	cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/
 	cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/
 endef
 
 define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS
-	$(foreach l,$(AZURE_IOT_SDK_C_LIBS), \
-		$(INSTALL) -D -m 0755 $(@D)/$(l) $(TARGET_DIR)/usr/lib/
-	)
+	$(call AZURE_IOT_SDK_C_INSTALL_LIBS,$(TARGET_DIR))
 endef
 
 $(eval $(cmake-package))

buildroot/package/binutils/2.31.1/0019-xtensa-fix-PR-ld-25861.patch

@@ -0,0 +1,376 @@
+From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 19 Apr 2020 19:04:41 -0700
+Subject: [PATCH] xtensa: fix PR ld/25861
+
+Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences
+(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32}
+for negative differences (subtracted symbol follows diminished symbol).
+Don't generate XTENSA_DIFF relocations in the assembler, generate
+XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position.
+
+Handle XTENSA_DIFF in BFD for compatibility with old object files.
+Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value
+as unsigned.
+
+2020-04-22  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* bfd-in2.h: Regenerated.
+	* elf32-xtensa.c (elf_howto_table): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+	(elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc)
+	(relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and
+	R_XTENSA_NDIFF{8,16,32}.
+	* libbfd.h (bfd_reloc_code_real_names): Add names for
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+	* reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32}
+	and BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+binutils/
+	* readelf.c (is_none_reloc): Recognize
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+gas/
+	* config/tc-xtensa.c (md_apply_fix): Replace
+	BFD_RELOC_XTENSA_DIFF{8,16,32} generation with
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32} generation.
+	* testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16
+	with BFD_RELOC_XTENSA_PDIFF16 in the expected output.
+
+include/
+	* elf/xtensa.h (elf_xtensa_reloc_type): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20
+
+ bfd/bfd-in2.h                      | 20 ++++++-
+ bfd/elf32-xtensa.c                 | 89 +++++++++++++++++++++++++++++-
+ bfd/libbfd.h                       |  6 ++
+ bfd/reloc.c                        | 24 ++++++++
+ binutils/readelf.c                 |  8 ++-
+ gas/config/tc-xtensa.c             | 12 +++-
+ gas/testsuite/gas/xtensa/loc.d     |  2 +-
+ include/elf/xtensa.h               |  6 ++
+ 11 files changed, 160 insertions(+), 7 deletions(-)
+
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 37114607b515..be6a30f57955 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures.  */
+ PLT entries.  Otherwise, this is just a generic 32-bit relocation.  */
+   BFD_RELOC_XTENSA_PLT,
+ 
+-/* Xtensa relocations to mark the difference of two local symbols.
++/* Xtensa relocations for backward compatibility.  These have been replaced
++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
++Xtensa relocations to mark the difference of two local symbols.
+ These are only needed to support linker relaxation and can be ignored
+ when not relaxing.  The field is set to the value of the difference
+ assuming no relaxation.  The relocation encodes the position of the
+@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND.  */
+   BFD_RELOC_XTENSA_TLS_ARG,
+   BFD_RELOC_XTENSA_TLS_CALL,
+ 
++/* Xtensa relocations to mark the difference of two local symbols.
++These are only needed to support linker relaxation and can be ignored
++when not relaxing.  The field is set to the value of the difference
++assuming no relaxation.  The relocation encodes the position of the
++subtracted symbol so the linker can determine whether to adjust the field
++value.  PDIFF relocations are used for positive differences, NDIFF
++relocations are used for negative differences.  The difference value
++is treated as unsigned with these relocation types, giving full
++8/16 value ranges.  */
++  BFD_RELOC_XTENSA_PDIFF8,
++  BFD_RELOC_XTENSA_PDIFF16,
++  BFD_RELOC_XTENSA_PDIFF32,
++  BFD_RELOC_XTENSA_NDIFF8,
++  BFD_RELOC_XTENSA_NDIFF16,
++  BFD_RELOC_XTENSA_NDIFF32,
++
+ /* 8 bit signed offset in (ix+d) or (iy+d).  */
+   BFD_RELOC_Z80_DISP8,
+ 
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 473a9d76f289..fded42d52a9a 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] =
+   HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+ 	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL",
+ 	 FALSE, 0, 0, FALSE),
++
++  HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE),
++
++  HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE),
+ };
+ 
+ #if DEBUG_GEN_RELOC
+@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+       TRACE ("BFD_RELOC_XTENSA_DIFF32");
+       return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ];
+ 
++    case BFD_RELOC_XTENSA_PDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ];
++
++    case BFD_RELOC_XTENSA_PDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ];
++
++    case BFD_RELOC_XTENSA_PDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ];
++
++    case BFD_RELOC_XTENSA_NDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ];
++
++    case BFD_RELOC_XTENSA_NDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ];
++
++    case BFD_RELOC_XTENSA_NDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ];
++
+     case BFD_RELOC_XTENSA_RTLD:
+       TRACE ("BFD_RELOC_XTENSA_RTLD");
+       return &elf_howto_table[(unsigned) R_XTENSA_RTLD ];
+@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto,
+     case R_XTENSA_DIFF8:
+     case R_XTENSA_DIFF16:
+     case R_XTENSA_DIFF32:
++    case R_XTENSA_PDIFF8:
++    case R_XTENSA_PDIFF16:
++    case R_XTENSA_PDIFF32:
++    case R_XTENSA_NDIFF8:
++    case R_XTENSA_NDIFF16:
++    case R_XTENSA_NDIFF32:
+     case R_XTENSA_TLS_FUNC:
+     case R_XTENSA_TLS_ARG:
+     case R_XTENSA_TLS_CALL:
+@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 
+ 	      if (r_type == R_XTENSA_DIFF8
+ 		  || r_type == R_XTENSA_DIFF16
+-		  || r_type == R_XTENSA_DIFF32)
++		  || r_type == R_XTENSA_DIFF32
++		  || r_type == R_XTENSA_PDIFF8
++		  || r_type == R_XTENSA_PDIFF16
++		  || r_type == R_XTENSA_PDIFF32
++		  || r_type == R_XTENSA_NDIFF8
++		  || r_type == R_XTENSA_NDIFF16
++		  || r_type == R_XTENSA_NDIFF32)
+ 		{
+ 		  bfd_signed_vma diff_value = 0;
+ 		  bfd_vma new_end_offset, diff_mask = 0;
+@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_value =
++			bfd_get_8 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_value =
++			bfd_get_16 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_value =
++			bfd_get_32 (abfd, &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
++		  if (r_type >= R_XTENSA_NDIFF8
++		      && r_type <= R_XTENSA_NDIFF32)
++		    diff_value = -diff_value;
++
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+ 		     r_rel.target_offset + diff_value);
+@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
++		      bfd_put_8 (abfd, diff_value,
++				 &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
++		      bfd_put_16 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
++		      bfd_put_32 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
+ 		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+diff --git a/bfd/libbfd.h b/bfd/libbfd.h
+index 3c184fcadadf..989f4bc0b595 100644
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
+@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+   "BFD_RELOC_XTENSA_TLS_FUNC",
+   "BFD_RELOC_XTENSA_TLS_ARG",
+   "BFD_RELOC_XTENSA_TLS_CALL",
++  "BFD_RELOC_XTENSA_PDIFF8",
++  "BFD_RELOC_XTENSA_PDIFF16",
++  "BFD_RELOC_XTENSA_PDIFF32",
++  "BFD_RELOC_XTENSA_NDIFF8",
++  "BFD_RELOC_XTENSA_NDIFF16",
++  "BFD_RELOC_XTENSA_NDIFF32",
+   "BFD_RELOC_Z80_DISP8",
+   "BFD_RELOC_Z80_BYTE0",
+   "BFD_RELOC_Z80_BYTE1",
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index c4dec86d1d46..f5df8e2ab3eb 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -6556,6 +6556,8 @@ ENUMX
+ ENUMX
+   BFD_RELOC_XTENSA_DIFF32
+ ENUMDOC
++  Xtensa relocations for backward compatibility.  These have been replaced
++  by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
+   Xtensa relocations to mark the difference of two local symbols.
+   These are only needed to support linker relaxation and can be ignored
+   when not relaxing.  The field is set to the value of the difference
+@@ -6668,6 +6670,28 @@ ENUMX
+   BFD_RELOC_XTENSA_TLS_CALL
+ ENUMDOC
+   Xtensa TLS relocations.
++ENUM
++  BFD_RELOC_XTENSA_PDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF32
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF32
++ENUMDOC
++  Xtensa relocations to mark the difference of two local symbols.
++  These are only needed to support linker relaxation and can be ignored
++  when not relaxing.  The field is set to the value of the difference
++  assuming no relaxation.  The relocation encodes the position of the
++  subtracted symbol so the linker can determine whether to adjust the field
++  value.  PDIFF relocations are used for positive differences, NDIFF
++  relocations are used for negative differences.  The difference value
++  is treated as unsigned with these relocation types, giving full
++  8/16 value ranges.
+ 
+ ENUM
+   BFD_RELOC_Z80_DISP8
+diff --git a/binutils/readelf.c b/binutils/readelf.c
+index d4756c93b345..800918f901c8 100644
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type)
+       return (reloc_type == 0      /* R_XTENSA_NONE.  */
+ 	      || reloc_type == 17  /* R_XTENSA_DIFF8.  */
+ 	      || reloc_type == 18  /* R_XTENSA_DIFF16.  */
+-	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */);
++	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */
++	      || reloc_type == 57  /* R_XTENSA_PDIFF8.  */
++	      || reloc_type == 58  /* R_XTENSA_PDIFF16.  */
++	      || reloc_type == 59  /* R_XTENSA_PDIFF32.  */
++	      || reloc_type == 60  /* R_XTENSA_NDIFF8.  */
++	      || reloc_type == 61  /* R_XTENSA_NDIFF16.  */
++	      || reloc_type == 62  /* R_XTENSA_NDIFF32.  */);
+     }
+   return FALSE;
+ }
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 71d4d94a8d7d..ee75c13548ff 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+     case BFD_RELOC_8:
+       if (fixP->fx_subsy)
+ 	{
++	  bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset
++	    < S_GET_VALUE (fixP->fx_subsy);
++
+ 	  switch (fixP->fx_r_type)
+ 	    {
+ 	    case BFD_RELOC_8:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_16:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_32:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    default:
+diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
+index 71983cc90055..8fb3425999d5 100644
+--- a/gas/testsuite/gas/xtensa/loc.d
++++ b/gas/testsuite/gas/xtensa/loc.d
+@@ -6,5 +6,5 @@
+ 
+ RELOCATION RECORDS FOR \[\.debug_line\]:
+ #...
+-.*R_XTENSA_DIFF16.*\.text\+0x00009c42
++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42
+ #...
+diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h
+index 2eb5e4e52941..bd5c80d13777 100644
+--- a/include/elf/xtensa.h
++++ b/include/elf/xtensa.h
+@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type)
+      RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54)
+      RELOC_NUMBER (R_XTENSA_TLS_ARG, 55)
+      RELOC_NUMBER (R_XTENSA_TLS_CALL, 56)
++     RELOC_NUMBER (R_XTENSA_PDIFF8, 57)
++     RELOC_NUMBER (R_XTENSA_PDIFF16, 58)
++     RELOC_NUMBER (R_XTENSA_PDIFF32, 59)
++     RELOC_NUMBER (R_XTENSA_NDIFF8, 60)
++     RELOC_NUMBER (R_XTENSA_NDIFF16, 61)
++     RELOC_NUMBER (R_XTENSA_NDIFF32, 62)
+ END_RELOC_NUMBERS (R_XTENSA_max)
+ 
+ /* Processor-specific flags for the ELF header e_flags field.  */
+-- 
+2.20.1
+

buildroot/package/binutils/2.31.1/0020-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch

@@ -0,0 +1,128 @@
+From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sat, 25 Apr 2020 00:40:25 -0700
+Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861
+
+Fields marked with XTENSA_NDIFF relocations are not negated, they only
+have sign bits removed. Don't negate their values when relaxation is
+performed. Don't add sign bits when the value is zero. Report overflow
+when the result has negative sign but all significant bits are zero.
+
+2020-04-29  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* elf32-xtensa.c (relax_section): Don't negate diff_value for
+	XTENSA_NDIFF relocations. Don't add sign bits whe diff_value
+	equals 0. Report overflow when the result has negative sign but
+	all significant bits are zero.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556
+---
+
+ bfd/elf32-xtensa.c                   | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index fded42d52a9a..4327b027911f 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
++		      diff_mask = 0x7f;
+ 		      diff_value =
+ 			bfd_get_signed_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
++		      diff_mask = 0x7fff;
+ 		      diff_value =
+ 			bfd_get_signed_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
++		      diff_mask = 0x7fffffff;
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
+ 		      diff_value =
+ 			bfd_get_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
+ 		      diff_value =
+ 			bfd_get_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
+ 		      diff_value =
+ 			bfd_get_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+ 		  if (r_type >= R_XTENSA_NDIFF8
+-		      && r_type <= R_XTENSA_NDIFF32)
+-		    diff_value = -diff_value;
++		      && r_type <= R_XTENSA_NDIFF32
++		      && diff_value)
++		    diff_value |= ~diff_mask;
+ 
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
+-		      diff_mask = 0x7f;
+ 		      bfd_put_signed_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
+-		      diff_mask = 0x7fff;
+ 		      bfd_put_signed_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
+-		      diff_mask = 0x7fffffff;
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
+-		      diff_mask = 0xff;
+ 		      bfd_put_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
+-		      diff_mask = 0xffff;
+ 		      bfd_put_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
+-		      diff_mask = 0xffffffff;
+ 		      bfd_put_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+-		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+-		  if ((diff_value & ~diff_mask) != 0 &&
+-		      (diff_value & ~diff_mask) != (-1 & ~diff_mask))
++		  /* Check for overflow. Sign bits must be all zeroes or
++		     all ones.  When sign bits are all ones diff_value
++		     may not be zero.  */
++		  if (((diff_value & ~diff_mask) != 0
++		       && (diff_value & ~diff_mask) != ~diff_mask)
++		      || (diff_value && (bfd_vma) diff_value == ~diff_mask))
+ 		    {
+ 		      (*link_info->callbacks->reloc_dangerous)
+ 			(link_info, _("overflow after relaxation"),
+-- 
+2.20.1
+

buildroot/package/binutils/2.32/0008-xtensa-fix-PR-ld-25861.patch

@@ -0,0 +1,432 @@
+From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 19 Apr 2020 19:04:41 -0700
+Subject: [PATCH] xtensa: fix PR ld/25861
+
+Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences
+(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32}
+for negative differences (subtracted symbol follows diminished symbol).
+Don't generate XTENSA_DIFF relocations in the assembler, generate
+XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position.
+
+Handle XTENSA_DIFF in BFD for compatibility with old object files.
+Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value
+as unsigned.
+
+2020-04-22  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* bfd-in2.h: Regenerated.
+	* elf32-xtensa.c (elf_howto_table): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+	(elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc)
+	(relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and
+	R_XTENSA_NDIFF{8,16,32}.
+	* libbfd.h (bfd_reloc_code_real_names): Add names for
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+	* reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32}
+	and BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+binutils/
+	* readelf.c (is_none_reloc): Recognize
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+gas/
+	* config/tc-xtensa.c (md_apply_fix): Replace
+	BFD_RELOC_XTENSA_DIFF{8,16,32} generation with
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32} generation.
+	* testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16
+	with BFD_RELOC_XTENSA_PDIFF16 in the expected output.
+
+include/
+	* elf/xtensa.h (elf_xtensa_reloc_type): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+
+ld/
+	* testsuite/ld-xtensa/relax-loc.d: New test definition.
+	* testsuite/ld-xtensa/relax-loc.s: New test source.
+	* testsuite/ld-xtensa/xtensa.exp (relax-loc): New test.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20
+
+ bfd/bfd-in2.h                      | 20 ++++++-
+ bfd/elf32-xtensa.c                 | 89 +++++++++++++++++++++++++++++-
+ bfd/libbfd.h                       |  6 ++
+ bfd/reloc.c                        | 24 ++++++++
+ binutils/readelf.c                 |  8 ++-
+ gas/config/tc-xtensa.c             | 12 +++-
+ gas/testsuite/gas/xtensa/loc.d     |  2 +-
+ include/elf/xtensa.h               |  6 ++
+ ld/testsuite/ld-xtensa/relax-loc.d |  7 +++
+ ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++
+ ld/testsuite/ld-xtensa/xtensa.exp  |  1 +
+ 11 files changed, 183 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d
+ create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s
+
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 37114607b515..be6a30f57955 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures.  */
+ PLT entries.  Otherwise, this is just a generic 32-bit relocation.  */
+   BFD_RELOC_XTENSA_PLT,
+ 
+-/* Xtensa relocations to mark the difference of two local symbols.
++/* Xtensa relocations for backward compatibility.  These have been replaced
++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
++Xtensa relocations to mark the difference of two local symbols.
+ These are only needed to support linker relaxation and can be ignored
+ when not relaxing.  The field is set to the value of the difference
+ assuming no relaxation.  The relocation encodes the position of the
+@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND.  */
+   BFD_RELOC_XTENSA_TLS_ARG,
+   BFD_RELOC_XTENSA_TLS_CALL,
+ 
++/* Xtensa relocations to mark the difference of two local symbols.
++These are only needed to support linker relaxation and can be ignored
++when not relaxing.  The field is set to the value of the difference
++assuming no relaxation.  The relocation encodes the position of the
++subtracted symbol so the linker can determine whether to adjust the field
++value.  PDIFF relocations are used for positive differences, NDIFF
++relocations are used for negative differences.  The difference value
++is treated as unsigned with these relocation types, giving full
++8/16 value ranges.  */
++  BFD_RELOC_XTENSA_PDIFF8,
++  BFD_RELOC_XTENSA_PDIFF16,
++  BFD_RELOC_XTENSA_PDIFF32,
++  BFD_RELOC_XTENSA_NDIFF8,
++  BFD_RELOC_XTENSA_NDIFF16,
++  BFD_RELOC_XTENSA_NDIFF32,
++
+ /* 8 bit signed offset in (ix+d) or (iy+d).  */
+   BFD_RELOC_Z80_DISP8,
+ 
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 473a9d76f289..fded42d52a9a 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] =
+   HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+ 	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL",
+ 	 FALSE, 0, 0, FALSE),
++
++  HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE),
++
++  HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE),
+ };
+ 
+ #if DEBUG_GEN_RELOC
+@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+       TRACE ("BFD_RELOC_XTENSA_DIFF32");
+       return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ];
+ 
++    case BFD_RELOC_XTENSA_PDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ];
++
++    case BFD_RELOC_XTENSA_PDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ];
++
++    case BFD_RELOC_XTENSA_PDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ];
++
++    case BFD_RELOC_XTENSA_NDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ];
++
++    case BFD_RELOC_XTENSA_NDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ];
++
++    case BFD_RELOC_XTENSA_NDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ];
++
+     case BFD_RELOC_XTENSA_RTLD:
+       TRACE ("BFD_RELOC_XTENSA_RTLD");
+       return &elf_howto_table[(unsigned) R_XTENSA_RTLD ];
+@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto,
+     case R_XTENSA_DIFF8:
+     case R_XTENSA_DIFF16:
+     case R_XTENSA_DIFF32:
++    case R_XTENSA_PDIFF8:
++    case R_XTENSA_PDIFF16:
++    case R_XTENSA_PDIFF32:
++    case R_XTENSA_NDIFF8:
++    case R_XTENSA_NDIFF16:
++    case R_XTENSA_NDIFF32:
+     case R_XTENSA_TLS_FUNC:
+     case R_XTENSA_TLS_ARG:
+     case R_XTENSA_TLS_CALL:
+@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 
+ 	      if (r_type == R_XTENSA_DIFF8
+ 		  || r_type == R_XTENSA_DIFF16
+-		  || r_type == R_XTENSA_DIFF32)
++		  || r_type == R_XTENSA_DIFF32
++		  || r_type == R_XTENSA_PDIFF8
++		  || r_type == R_XTENSA_PDIFF16
++		  || r_type == R_XTENSA_PDIFF32
++		  || r_type == R_XTENSA_NDIFF8
++		  || r_type == R_XTENSA_NDIFF16
++		  || r_type == R_XTENSA_NDIFF32)
+ 		{
+ 		  bfd_signed_vma diff_value = 0;
+ 		  bfd_vma new_end_offset, diff_mask = 0;
+@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_value =
++			bfd_get_8 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_value =
++			bfd_get_16 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_value =
++			bfd_get_32 (abfd, &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
++		  if (r_type >= R_XTENSA_NDIFF8
++		      && r_type <= R_XTENSA_NDIFF32)
++		    diff_value = -diff_value;
++
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+ 		     r_rel.target_offset + diff_value);
+@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
++		      bfd_put_8 (abfd, diff_value,
++				 &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
++		      bfd_put_16 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
++		      bfd_put_32 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
+ 		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+diff --git a/bfd/libbfd.h b/bfd/libbfd.h
+index 3c184fcadadf..989f4bc0b595 100644
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
+@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+   "BFD_RELOC_XTENSA_TLS_FUNC",
+   "BFD_RELOC_XTENSA_TLS_ARG",
+   "BFD_RELOC_XTENSA_TLS_CALL",
++  "BFD_RELOC_XTENSA_PDIFF8",
++  "BFD_RELOC_XTENSA_PDIFF16",
++  "BFD_RELOC_XTENSA_PDIFF32",
++  "BFD_RELOC_XTENSA_NDIFF8",
++  "BFD_RELOC_XTENSA_NDIFF16",
++  "BFD_RELOC_XTENSA_NDIFF32",
+   "BFD_RELOC_Z80_DISP8",
+   "BFD_RELOC_Z80_BYTE0",
+   "BFD_RELOC_Z80_BYTE1",
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index c4dec86d1d46..f5df8e2ab3eb 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -6556,6 +6556,8 @@ ENUMX
+ ENUMX
+   BFD_RELOC_XTENSA_DIFF32
+ ENUMDOC
++  Xtensa relocations for backward compatibility.  These have been replaced
++  by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
+   Xtensa relocations to mark the difference of two local symbols.
+   These are only needed to support linker relaxation and can be ignored
+   when not relaxing.  The field is set to the value of the difference
+@@ -6668,6 +6670,28 @@ ENUMX
+   BFD_RELOC_XTENSA_TLS_CALL
+ ENUMDOC
+   Xtensa TLS relocations.
++ENUM
++  BFD_RELOC_XTENSA_PDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF32
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF32
++ENUMDOC
++  Xtensa relocations to mark the difference of two local symbols.
++  These are only needed to support linker relaxation and can be ignored
++  when not relaxing.  The field is set to the value of the difference
++  assuming no relaxation.  The relocation encodes the position of the
++  subtracted symbol so the linker can determine whether to adjust the field
++  value.  PDIFF relocations are used for positive differences, NDIFF
++  relocations are used for negative differences.  The difference value
++  is treated as unsigned with these relocation types, giving full
++  8/16 value ranges.
+ 
+ ENUM
+   BFD_RELOC_Z80_DISP8
+diff --git a/binutils/readelf.c b/binutils/readelf.c
+index d4756c93b345..800918f901c8 100644
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type)
+       return (reloc_type == 0      /* R_XTENSA_NONE.  */
+ 	      || reloc_type == 17  /* R_XTENSA_DIFF8.  */
+ 	      || reloc_type == 18  /* R_XTENSA_DIFF16.  */
+-	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */);
++	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */
++	      || reloc_type == 57  /* R_XTENSA_PDIFF8.  */
++	      || reloc_type == 58  /* R_XTENSA_PDIFF16.  */
++	      || reloc_type == 59  /* R_XTENSA_PDIFF32.  */
++	      || reloc_type == 60  /* R_XTENSA_NDIFF8.  */
++	      || reloc_type == 61  /* R_XTENSA_NDIFF16.  */
++	      || reloc_type == 62  /* R_XTENSA_NDIFF32.  */);
+     }
+   return FALSE;
+ }
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 71d4d94a8d7d..ee75c13548ff 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+     case BFD_RELOC_8:
+       if (fixP->fx_subsy)
+ 	{
++	  bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset
++	    < S_GET_VALUE (fixP->fx_subsy);
++
+ 	  switch (fixP->fx_r_type)
+ 	    {
+ 	    case BFD_RELOC_8:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_16:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_32:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    default:
+diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
+index 71983cc90055..8fb3425999d5 100644
+--- a/gas/testsuite/gas/xtensa/loc.d
++++ b/gas/testsuite/gas/xtensa/loc.d
+@@ -6,5 +6,5 @@
+ 
+ RELOCATION RECORDS FOR \[\.debug_line\]:
+ #...
+-.*R_XTENSA_DIFF16.*\.text\+0x00009c42
++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42
+ #...
+diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h
+index 2eb5e4e52941..bd5c80d13777 100644
+--- a/include/elf/xtensa.h
++++ b/include/elf/xtensa.h
+@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type)
+      RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54)
+      RELOC_NUMBER (R_XTENSA_TLS_ARG, 55)
+      RELOC_NUMBER (R_XTENSA_TLS_CALL, 56)
++     RELOC_NUMBER (R_XTENSA_PDIFF8, 57)
++     RELOC_NUMBER (R_XTENSA_PDIFF16, 58)
++     RELOC_NUMBER (R_XTENSA_PDIFF32, 59)
++     RELOC_NUMBER (R_XTENSA_NDIFF8, 60)
++     RELOC_NUMBER (R_XTENSA_NDIFF16, 61)
++     RELOC_NUMBER (R_XTENSA_NDIFF32, 62)
+ END_RELOC_NUMBERS (R_XTENSA_max)
+ 
+ /* Processor-specific flags for the ELF header e_flags field.  */
+diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d
+new file mode 100644
+index 000000000000..3c8d673732ff
+--- /dev/null
++++ b/ld/testsuite/ld-xtensa/relax-loc.d
+@@ -0,0 +1,7 @@
++#as: --text-section-literals
++#ld:
++#objdump: --dwarf=decodedline
++#...
++relax-loc.s[ 	]+1[ 	]+0x400054[ 	]+.*
++relax-loc.s[ 	]+2[ 	]+0x40005c[ 	]+.*
++#...
+diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s
+new file mode 100644
+index 000000000000..d768470e287a
+--- /dev/null
++++ b/ld/testsuite/ld-xtensa/relax-loc.s
+@@ -0,0 +1,15 @@
++	.file	1 "relax-loc.s"
++	.globl	_start
++	.globl	_ResetVector
++	.text
++_ResetVector:
++_start:
++	.loc	1 1
++	j	1f
++	.literal_position
++1:
++	.loc	1 2
++
++	.rep	10000
++	movi	a2, 0x12345678
++	.endr
+diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp
+index 9b2235b2151b..de39887936ad 100644
+--- a/ld/testsuite/ld-xtensa/xtensa.exp
++++ b/ld/testsuite/ld-xtensa/xtensa.exp
+@@ -27,6 +27,7 @@ run_dump_test "call_overflow"
+ run_dump_test "coalesce"
+ run_dump_test "diff_overflow"
+ run_dump_test "lcall"
++run_dump_test "relax-loc"
+ 
+ run_dump_test "relax-static-pie"
+ run_dump_test "relax-static-local-pie"
+-- 
+2.20.1
+

buildroot/package/binutils/2.32/0009-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch

@@ -0,0 +1,128 @@
+From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sat, 25 Apr 2020 00:40:25 -0700
+Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861
+
+Fields marked with XTENSA_NDIFF relocations are not negated, they only
+have sign bits removed. Don't negate their values when relaxation is
+performed. Don't add sign bits when the value is zero. Report overflow
+when the result has negative sign but all significant bits are zero.
+
+2020-04-29  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* elf32-xtensa.c (relax_section): Don't negate diff_value for
+	XTENSA_NDIFF relocations. Don't add sign bits whe diff_value
+	equals 0. Report overflow when the result has negative sign but
+	all significant bits are zero.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556
+---
+
+ bfd/elf32-xtensa.c                   | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index fded42d52a9a..4327b027911f 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
++		      diff_mask = 0x7f;
+ 		      diff_value =
+ 			bfd_get_signed_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
++		      diff_mask = 0x7fff;
+ 		      diff_value =
+ 			bfd_get_signed_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
++		      diff_mask = 0x7fffffff;
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
+ 		      diff_value =
+ 			bfd_get_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
+ 		      diff_value =
+ 			bfd_get_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
+ 		      diff_value =
+ 			bfd_get_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+ 		  if (r_type >= R_XTENSA_NDIFF8
+-		      && r_type <= R_XTENSA_NDIFF32)
+-		    diff_value = -diff_value;
++		      && r_type <= R_XTENSA_NDIFF32
++		      && diff_value)
++		    diff_value |= ~diff_mask;
+ 
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
+-		      diff_mask = 0x7f;
+ 		      bfd_put_signed_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
+-		      diff_mask = 0x7fff;
+ 		      bfd_put_signed_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
+-		      diff_mask = 0x7fffffff;
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
+-		      diff_mask = 0xff;
+ 		      bfd_put_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
+-		      diff_mask = 0xffff;
+ 		      bfd_put_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
+-		      diff_mask = 0xffffffff;
+ 		      bfd_put_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+-		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+-		  if ((diff_value & ~diff_mask) != 0 &&
+-		      (diff_value & ~diff_mask) != (-1 & ~diff_mask))
++		  /* Check for overflow. Sign bits must be all zeroes or
++		     all ones.  When sign bits are all ones diff_value
++		     may not be zero.  */
++		  if (((diff_value & ~diff_mask) != 0
++		       && (diff_value & ~diff_mask) != ~diff_mask)
++		      || (diff_value && (bfd_vma) diff_value == ~diff_mask))
+ 		    {
+ 		      (*link_info->callbacks->reloc_dangerous)
+ 			(link_info, _("overflow after relaxation"),
+-- 
+2.20.1
+

buildroot/package/binutils/2.33.1/0005-xtensa-fix-PR-ld-25861.patch

@@ -0,0 +1,432 @@
+From c7a1d1f656c717394937a92cb970f0f4cecce128 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 19 Apr 2020 19:04:41 -0700
+Subject: [PATCH] xtensa: fix PR ld/25861
+
+Introduce new relaxations XTENSA_PDIFF{8,16,32} for positive differences
+(subtracted symbol precedes diminished symbol) and XTENSA_NDIFF{8,16,32}
+for negative differences (subtracted symbol follows diminished symbol).
+Don't generate XTENSA_DIFF relocations in the assembler, generate
+XTENSA_PDIFF or XTENSA_NDIFF based on relative symbol position.
+
+Handle XTENSA_DIFF in BFD for compatibility with old object files.
+Handle XTENSA_PDIFF and XTENSA_NDIFF in BFD, treating difference value
+as unsigned.
+
+2020-04-22  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* bfd-in2.h: Regenerated.
+	* elf32-xtensa.c (elf_howto_table): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+	(elf_xtensa_reloc_type_lookup, elf_xtensa_do_reloc)
+	(relax_section): Add cases for R_XTENSA_PDIFF{8,16,32} and
+	R_XTENSA_NDIFF{8,16,32}.
+	* libbfd.h (bfd_reloc_code_real_names): Add names for
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+	* reloc.c: Add documentation for BFD_RELOC_XTENSA_PDIFF{8,16,32}
+	and BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+binutils/
+	* readelf.c (is_none_reloc): Recognize
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32}.
+
+gas/
+	* config/tc-xtensa.c (md_apply_fix): Replace
+	BFD_RELOC_XTENSA_DIFF{8,16,32} generation with
+	BFD_RELOC_XTENSA_PDIFF{8,16,32} and
+	BFD_RELOC_XTENSA_NDIFF{8,16,32} generation.
+	* testsuite/gas/xtensa/loc.d: Replace BFD_RELOC_XTENSA_DIFF16
+	with BFD_RELOC_XTENSA_PDIFF16 in the expected output.
+
+include/
+	* elf/xtensa.h (elf_xtensa_reloc_type): New entries for
+	R_XTENSA_PDIFF{8,16,32} and R_XTENSA_NDIFF{8,16,32}.
+
+ld/
+	* testsuite/ld-xtensa/relax-loc.d: New test definition.
+	* testsuite/ld-xtensa/relax-loc.s: New test source.
+	* testsuite/ld-xtensa/xtensa.exp (relax-loc): New test.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: 30ce8e47fad9b057b6d7af9e1d43061126d34d20
+
+ bfd/bfd-in2.h                      | 20 ++++++-
+ bfd/elf32-xtensa.c                 | 89 +++++++++++++++++++++++++++++-
+ bfd/libbfd.h                       |  6 ++
+ bfd/reloc.c                        | 24 ++++++++
+ binutils/readelf.c                 |  8 ++-
+ gas/config/tc-xtensa.c             | 12 +++-
+ gas/testsuite/gas/xtensa/loc.d     |  2 +-
+ include/elf/xtensa.h               |  6 ++
+ ld/testsuite/ld-xtensa/relax-loc.d |  7 +++
+ ld/testsuite/ld-xtensa/relax-loc.s | 15 +++++
+ ld/testsuite/ld-xtensa/xtensa.exp  |  1 +
+ 11 files changed, 183 insertions(+), 7 deletions(-)
+ create mode 100644 ld/testsuite/ld-xtensa/relax-loc.d
+ create mode 100644 ld/testsuite/ld-xtensa/relax-loc.s
+
+diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
+index 37114607b515..be6a30f57955 100644
+--- a/bfd/bfd-in2.h
++++ b/bfd/bfd-in2.h
+@@ -5217,7 +5217,9 @@ to one of its own internal functions or data structures.  */
+ PLT entries.  Otherwise, this is just a generic 32-bit relocation.  */
+   BFD_RELOC_XTENSA_PLT,
+ 
+-/* Xtensa relocations to mark the difference of two local symbols.
++/* Xtensa relocations for backward compatibility.  These have been replaced
++by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
++Xtensa relocations to mark the difference of two local symbols.
+ These are only needed to support linker relaxation and can be ignored
+ when not relaxing.  The field is set to the value of the difference
+ assuming no relaxation.  The relocation encodes the position of the
+@@ -5291,6 +5293,22 @@ BFD_RELOC_XTENSA_ASM_EXPAND.  */
+   BFD_RELOC_XTENSA_TLS_ARG,
+   BFD_RELOC_XTENSA_TLS_CALL,
+ 
++/* Xtensa relocations to mark the difference of two local symbols.
++These are only needed to support linker relaxation and can be ignored
++when not relaxing.  The field is set to the value of the difference
++assuming no relaxation.  The relocation encodes the position of the
++subtracted symbol so the linker can determine whether to adjust the field
++value.  PDIFF relocations are used for positive differences, NDIFF
++relocations are used for negative differences.  The difference value
++is treated as unsigned with these relocation types, giving full
++8/16 value ranges.  */
++  BFD_RELOC_XTENSA_PDIFF8,
++  BFD_RELOC_XTENSA_PDIFF16,
++  BFD_RELOC_XTENSA_PDIFF32,
++  BFD_RELOC_XTENSA_NDIFF8,
++  BFD_RELOC_XTENSA_NDIFF16,
++  BFD_RELOC_XTENSA_NDIFF32,
++
+ /* 8 bit signed offset in (ix+d) or (iy+d).  */
+   BFD_RELOC_Z80_DISP8,
+ 
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index 473a9d76f289..fded42d52a9a 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -325,6 +325,20 @@ static reloc_howto_type elf_howto_table[] =
+   HOWTO (R_XTENSA_TLS_CALL, 0, 0, 0, FALSE, 0, complain_overflow_dont,
+ 	 bfd_elf_xtensa_reloc, "R_XTENSA_TLS_CALL",
+ 	 FALSE, 0, 0, FALSE),
++
++  HOWTO (R_XTENSA_PDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_PDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_PDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_PDIFF32", FALSE, 0, 0xffffffff, FALSE),
++
++  HOWTO (R_XTENSA_NDIFF8, 0, 0, 8, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF8", FALSE, 0, 0xff, FALSE),
++  HOWTO (R_XTENSA_NDIFF16, 0, 1, 16, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF16", FALSE, 0, 0xffff, FALSE),
++  HOWTO (R_XTENSA_NDIFF32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
++	 bfd_elf_xtensa_reloc, "R_XTENSA_NDIFF32", FALSE, 0, 0xffffffff, FALSE),
+ };
+ 
+ #if DEBUG_GEN_RELOC
+@@ -364,6 +378,30 @@ elf_xtensa_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+       TRACE ("BFD_RELOC_XTENSA_DIFF32");
+       return &elf_howto_table[(unsigned) R_XTENSA_DIFF32 ];
+ 
++    case BFD_RELOC_XTENSA_PDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF8 ];
++
++    case BFD_RELOC_XTENSA_PDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF16 ];
++
++    case BFD_RELOC_XTENSA_PDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_PDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_PDIFF32 ];
++
++    case BFD_RELOC_XTENSA_NDIFF8:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF8");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF8 ];
++
++    case BFD_RELOC_XTENSA_NDIFF16:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF16");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF16 ];
++
++    case BFD_RELOC_XTENSA_NDIFF32:
++      TRACE ("BFD_RELOC_XTENSA_NDIFF32");
++      return &elf_howto_table[(unsigned) R_XTENSA_NDIFF32 ];
++
+     case BFD_RELOC_XTENSA_RTLD:
+       TRACE ("BFD_RELOC_XTENSA_RTLD");
+       return &elf_howto_table[(unsigned) R_XTENSA_RTLD ];
+@@ -1851,6 +1889,12 @@ elf_xtensa_do_reloc (reloc_howto_type *howto,
+     case R_XTENSA_DIFF8:
+     case R_XTENSA_DIFF16:
+     case R_XTENSA_DIFF32:
++    case R_XTENSA_PDIFF8:
++    case R_XTENSA_PDIFF16:
++    case R_XTENSA_PDIFF32:
++    case R_XTENSA_NDIFF8:
++    case R_XTENSA_NDIFF16:
++    case R_XTENSA_NDIFF32:
+     case R_XTENSA_TLS_FUNC:
+     case R_XTENSA_TLS_ARG:
+     case R_XTENSA_TLS_CALL:
+@@ -9604,7 +9648,13 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 
+ 	      if (r_type == R_XTENSA_DIFF8
+ 		  || r_type == R_XTENSA_DIFF16
+-		  || r_type == R_XTENSA_DIFF32)
++		  || r_type == R_XTENSA_DIFF32
++		  || r_type == R_XTENSA_PDIFF8
++		  || r_type == R_XTENSA_PDIFF16
++		  || r_type == R_XTENSA_PDIFF32
++		  || r_type == R_XTENSA_NDIFF8
++		  || r_type == R_XTENSA_NDIFF16
++		  || r_type == R_XTENSA_NDIFF32)
+ 		{
+ 		  bfd_signed_vma diff_value = 0;
+ 		  bfd_vma new_end_offset, diff_mask = 0;
+@@ -9631,8 +9681,27 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_value =
++			bfd_get_8 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_value =
++			bfd_get_16 (abfd, &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_value =
++			bfd_get_32 (abfd, &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
++		  if (r_type >= R_XTENSA_NDIFF8
++		      && r_type <= R_XTENSA_NDIFF32)
++		    diff_value = -diff_value;
++
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+ 		     r_rel.target_offset + diff_value);
+@@ -9655,6 +9724,24 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
++		    case R_XTENSA_PDIFF8:
++		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
++		      bfd_put_8 (abfd, diff_value,
++				 &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF16:
++		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
++		      bfd_put_16 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
++		    case R_XTENSA_PDIFF32:
++		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
++		      bfd_put_32 (abfd, diff_value,
++				  &contents[old_source_offset]);
++		      break;
+ 		    }
+ 
+ 		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+diff --git a/bfd/libbfd.h b/bfd/libbfd.h
+index 3c184fcadadf..989f4bc0b595 100644
+--- a/bfd/libbfd.h
++++ b/bfd/libbfd.h
+@@ -2919,6 +2919,12 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
+   "BFD_RELOC_XTENSA_TLS_FUNC",
+   "BFD_RELOC_XTENSA_TLS_ARG",
+   "BFD_RELOC_XTENSA_TLS_CALL",
++  "BFD_RELOC_XTENSA_PDIFF8",
++  "BFD_RELOC_XTENSA_PDIFF16",
++  "BFD_RELOC_XTENSA_PDIFF32",
++  "BFD_RELOC_XTENSA_NDIFF8",
++  "BFD_RELOC_XTENSA_NDIFF16",
++  "BFD_RELOC_XTENSA_NDIFF32",
+   "BFD_RELOC_Z80_DISP8",
+   "BFD_RELOC_Z80_BYTE0",
+   "BFD_RELOC_Z80_BYTE1",
+diff --git a/bfd/reloc.c b/bfd/reloc.c
+index c4dec86d1d46..f5df8e2ab3eb 100644
+--- a/bfd/reloc.c
++++ b/bfd/reloc.c
+@@ -6556,6 +6556,8 @@ ENUMX
+ ENUMX
+   BFD_RELOC_XTENSA_DIFF32
+ ENUMDOC
++  Xtensa relocations for backward compatibility.  These have been replaced
++  by BFD_RELOC_XTENSA_PDIFF and BFD_RELOC_XTENSA_NDIFF.
+   Xtensa relocations to mark the difference of two local symbols.
+   These are only needed to support linker relaxation and can be ignored
+   when not relaxing.  The field is set to the value of the difference
+@@ -6668,6 +6670,28 @@ ENUMX
+   BFD_RELOC_XTENSA_TLS_CALL
+ ENUMDOC
+   Xtensa TLS relocations.
++ENUM
++  BFD_RELOC_XTENSA_PDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_PDIFF32
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF8
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF16
++ENUMX
++  BFD_RELOC_XTENSA_NDIFF32
++ENUMDOC
++  Xtensa relocations to mark the difference of two local symbols.
++  These are only needed to support linker relaxation and can be ignored
++  when not relaxing.  The field is set to the value of the difference
++  assuming no relaxation.  The relocation encodes the position of the
++  subtracted symbol so the linker can determine whether to adjust the field
++  value.  PDIFF relocations are used for positive differences, NDIFF
++  relocations are used for negative differences.  The difference value
++  is treated as unsigned with these relocation types, giving full
++  8/16 value ranges.
+ 
+ ENUM
+   BFD_RELOC_Z80_DISP8
+diff --git a/binutils/readelf.c b/binutils/readelf.c
+index d4756c93b345..800918f901c8 100644
+--- a/binutils/readelf.c
++++ b/binutils/readelf.c
+@@ -13262,7 +13262,13 @@ is_none_reloc (Filedata * filedata, unsigned int reloc_type)
+       return (reloc_type == 0      /* R_XTENSA_NONE.  */
+ 	      || reloc_type == 17  /* R_XTENSA_DIFF8.  */
+ 	      || reloc_type == 18  /* R_XTENSA_DIFF16.  */
+-	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */);
++	      || reloc_type == 19  /* R_XTENSA_DIFF32.  */
++	      || reloc_type == 57  /* R_XTENSA_PDIFF8.  */
++	      || reloc_type == 58  /* R_XTENSA_PDIFF16.  */
++	      || reloc_type == 59  /* R_XTENSA_PDIFF32.  */
++	      || reloc_type == 60  /* R_XTENSA_NDIFF8.  */
++	      || reloc_type == 61  /* R_XTENSA_NDIFF16.  */
++	      || reloc_type == 62  /* R_XTENSA_NDIFF32.  */);
+     }
+   return FALSE;
+ }
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index 71d4d94a8d7d..ee75c13548ff 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -5974,18 +5974,24 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
+     case BFD_RELOC_8:
+       if (fixP->fx_subsy)
+ 	{
++	  bfd_boolean neg = S_GET_VALUE (fixP->fx_addsy) + fixP->fx_offset
++	    < S_GET_VALUE (fixP->fx_subsy);
++
+ 	  switch (fixP->fx_r_type)
+ 	    {
+ 	    case BFD_RELOC_8:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF8 : BFD_RELOC_XTENSA_PDIFF8;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_16:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF16 : BFD_RELOC_XTENSA_PDIFF16;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    case BFD_RELOC_32:
+-	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
++	      fixP->fx_r_type = neg
++		? BFD_RELOC_XTENSA_NDIFF32 : BFD_RELOC_XTENSA_PDIFF32;
+ 	      fixP->fx_signed = 0;
+ 	      break;
+ 	    default:
+diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
+index 71983cc90055..8fb3425999d5 100644
+--- a/gas/testsuite/gas/xtensa/loc.d
++++ b/gas/testsuite/gas/xtensa/loc.d
+@@ -6,5 +6,5 @@
+ 
+ RELOCATION RECORDS FOR \[\.debug_line\]:
+ #...
+-.*R_XTENSA_DIFF16.*\.text\+0x00009c42
++.*R_XTENSA_PDIFF16.*\.text\+0x00009c42
+ #...
+diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h
+index 2eb5e4e52941..bd5c80d13777 100644
+--- a/include/elf/xtensa.h
++++ b/include/elf/xtensa.h
+@@ -87,6 +87,12 @@ START_RELOC_NUMBERS (elf_xtensa_reloc_type)
+      RELOC_NUMBER (R_XTENSA_TLS_FUNC, 54)
+      RELOC_NUMBER (R_XTENSA_TLS_ARG, 55)
+      RELOC_NUMBER (R_XTENSA_TLS_CALL, 56)
++     RELOC_NUMBER (R_XTENSA_PDIFF8, 57)
++     RELOC_NUMBER (R_XTENSA_PDIFF16, 58)
++     RELOC_NUMBER (R_XTENSA_PDIFF32, 59)
++     RELOC_NUMBER (R_XTENSA_NDIFF8, 60)
++     RELOC_NUMBER (R_XTENSA_NDIFF16, 61)
++     RELOC_NUMBER (R_XTENSA_NDIFF32, 62)
+ END_RELOC_NUMBERS (R_XTENSA_max)
+ 
+ /* Processor-specific flags for the ELF header e_flags field.  */
+diff --git a/ld/testsuite/ld-xtensa/relax-loc.d b/ld/testsuite/ld-xtensa/relax-loc.d
+new file mode 100644
+index 000000000000..3c8d673732ff
+--- /dev/null
++++ b/ld/testsuite/ld-xtensa/relax-loc.d
+@@ -0,0 +1,7 @@
++#as: --text-section-literals
++#ld:
++#objdump: --dwarf=decodedline
++#...
++relax-loc.s[ 	]+1[ 	]+0x400054[ 	]+.*
++relax-loc.s[ 	]+2[ 	]+0x40005c[ 	]+.*
++#...
+diff --git a/ld/testsuite/ld-xtensa/relax-loc.s b/ld/testsuite/ld-xtensa/relax-loc.s
+new file mode 100644
+index 000000000000..d768470e287a
+--- /dev/null
++++ b/ld/testsuite/ld-xtensa/relax-loc.s
+@@ -0,0 +1,15 @@
++	.file	1 "relax-loc.s"
++	.globl	_start
++	.globl	_ResetVector
++	.text
++_ResetVector:
++_start:
++	.loc	1 1
++	j	1f
++	.literal_position
++1:
++	.loc	1 2
++
++	.rep	10000
++	movi	a2, 0x12345678
++	.endr
+diff --git a/ld/testsuite/ld-xtensa/xtensa.exp b/ld/testsuite/ld-xtensa/xtensa.exp
+index 9b2235b2151b..de39887936ad 100644
+--- a/ld/testsuite/ld-xtensa/xtensa.exp
++++ b/ld/testsuite/ld-xtensa/xtensa.exp
+@@ -27,6 +27,7 @@ run_dump_test "call_overflow"
+ run_dump_test "coalesce"
+ run_dump_test "diff_overflow"
+ run_dump_test "lcall"
++run_dump_test "relax-loc"
+ 
+ run_dump_test "relax-static-pie"
+ run_dump_test "relax-static-local-pie"
+-- 
+2.20.1
+

buildroot/package/binutils/2.33.1/0006-xtensa-fix-XTENSA_NDIFF-handling-for-PR-ld-25861.patch

@@ -0,0 +1,128 @@
+From 735321812435ae278d3766a3371f55937dc776d6 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sat, 25 Apr 2020 00:40:25 -0700
+Subject: [PATCH] xtensa: fix XTENSA_NDIFF handling for PR ld/25861
+
+Fields marked with XTENSA_NDIFF relocations are not negated, they only
+have sign bits removed. Don't negate their values when relaxation is
+performed. Don't add sign bits when the value is zero. Report overflow
+when the result has negative sign but all significant bits are zero.
+
+2020-04-29  Max Filippov  <jcmvbkbc@gmail.com>
+bfd/
+	* elf32-xtensa.c (relax_section): Don't negate diff_value for
+	XTENSA_NDIFF relocations. Don't add sign bits whe diff_value
+	equals 0. Report overflow when the result has negative sign but
+	all significant bits are zero.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: d548f47df4d2e3d117d504a4c9977982c78a0556
+---
+
+ bfd/elf32-xtensa.c                   | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
+index fded42d52a9a..4327b027911f 100644
+--- a/bfd/elf32-xtensa.c
++++ b/bfd/elf32-xtensa.c
+@@ -9670,37 +9670,44 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
++		      diff_mask = 0x7f;
+ 		      diff_value =
+ 			bfd_get_signed_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
++		      diff_mask = 0x7fff;
+ 		      diff_value =
+ 			bfd_get_signed_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
++		      diff_mask = 0x7fffffff;
+ 		      diff_value =
+ 			bfd_get_signed_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
++		      diff_mask = 0xff;
+ 		      diff_value =
+ 			bfd_get_8 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
++		      diff_mask = 0xffff;
+ 		      diff_value =
+ 			bfd_get_16 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
++		      diff_mask = 0xffffffff;
+ 		      diff_value =
+ 			bfd_get_32 (abfd, &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+ 		  if (r_type >= R_XTENSA_NDIFF8
+-		      && r_type <= R_XTENSA_NDIFF32)
+-		    diff_value = -diff_value;
++		      && r_type <= R_XTENSA_NDIFF32
++		      && diff_value)
++		    diff_value |= ~diff_mask;
+ 
+ 		  new_end_offset = offset_with_removed_text_map
+ 		    (&target_relax_info->action_list,
+@@ -9710,43 +9717,40 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
+ 		  switch (r_type)
+ 		    {
+ 		    case R_XTENSA_DIFF8:
+-		      diff_mask = 0x7f;
+ 		      bfd_put_signed_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF16:
+-		      diff_mask = 0x7fff;
+ 		      bfd_put_signed_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_DIFF32:
+-		      diff_mask = 0x7fffffff;
+ 		      bfd_put_signed_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF8:
+ 		    case R_XTENSA_NDIFF8:
+-		      diff_mask = 0xff;
+ 		      bfd_put_8 (abfd, diff_value,
+ 				 &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF16:
+ 		    case R_XTENSA_NDIFF16:
+-		      diff_mask = 0xffff;
+ 		      bfd_put_16 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    case R_XTENSA_PDIFF32:
+ 		    case R_XTENSA_NDIFF32:
+-		      diff_mask = 0xffffffff;
+ 		      bfd_put_32 (abfd, diff_value,
+ 				  &contents[old_source_offset]);
+ 		      break;
+ 		    }
+ 
+-		  /* Check for overflow. Sign bits must be all zeroes or all ones */
+-		  if ((diff_value & ~diff_mask) != 0 &&
+-		      (diff_value & ~diff_mask) != (-1 & ~diff_mask))
++		  /* Check for overflow. Sign bits must be all zeroes or
++		     all ones.  When sign bits are all ones diff_value
++		     may not be zero.  */
++		  if (((diff_value & ~diff_mask) != 0
++		       && (diff_value & ~diff_mask) != ~diff_mask)
++		      || (diff_value && (bfd_vma) diff_value == ~diff_mask))
+ 		    {
+ 		      (*link_info->callbacks->reloc_dangerous)
+ 			(link_info, _("overflow after relaxation"),
+-- 
+2.20.1
+

buildroot/package/boinc/boinc.mk

@@ -15,6 +15,7 @@ BOINC_LICENSE = LGPL-3.0+
 BOINC_LICENSE_FILES = COPYING COPYING.LESSER
 BOINC_DEPENDENCIES = host-pkgconf libcurl openssl
 BOINC_AUTORECONF = YES
+BOINC_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
 BOINC_CONF_OPTS = \
 	--disable-apps \
 	--disable-boinczip \

buildroot/package/c-ares/0001-use_check_build_instead_of_check_user.patch

@@ -1,17 +0,0 @@
-Use XC_CHECK_BUILD_FLAGS instead of XC_CHECK_USER_FLAGS.
-Otherwise it complains of CPPFLAGS in CFLAGS.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura c-ares-1.10.0.orig/m4/xc-cc-check.m4 c-ares-1.10.0/m4/xc-cc-check.m4
---- c-ares-1.10.0.orig/m4/xc-cc-check.m4	2013-12-26 19:40:46.354195974 -0300
-+++ c-ares-1.10.0/m4/xc-cc-check.m4	2013-12-26 19:41:01.850718535 -0300
-@@ -59,7 +59,7 @@
- 
- AC_DEFUN([_XC_PROG_CC], [
-   AC_REQUIRE([_XC_PROG_CC_PREAMBLE])dnl
--  AC_REQUIRE([XC_CHECK_USER_FLAGS])dnl
-+  AC_REQUIRE([XC_CHECK_BUILD_FLAGS])dnl
-   AC_REQUIRE([AC_PROG_INSTALL])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AM_PROG_CC_C_O])dnl

buildroot/package/c-ares/c-ares.hash

@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 6cdb97871f2930530c97deb7cf5c8fa4be5a0b02c7cea6e7c7667672a39d6852 c-ares-1.15.0.tar.gz
+sha256  d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce  c-ares-1.16.1.tar.gz
 
 # Hash for license file
-sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md
+sha256  db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c  LICENSE.md

buildroot/package/c-ares/c-ares.mk

@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-C_ARES_VERSION = 1.15.0
+C_ARES_VERSION = 1.16.1
 C_ARES_SITE = http://c-ares.haxx.se/download
 C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
-# Rebuild configure to avoid XC_CHECK_USER_CFLAGS
-C_ARES_AUTORECONF = YES
 C_ARES_LICENSE = MIT
 C_ARES_LICENSE_FILES = LICENSE.md
 

buildroot/package/cvs/cvs.hash

@@ -1,3 +1,8 @@
 # From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs/cvs_1.12.13-12%2Bsqueeze1.dsc
-sha256	b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1	cvs_1.12.13.orig.tar.gz
-sha256	d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f	cvs_1.12.13-12+squeeze1.diff.gz
+sha256  b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1  cvs_1.12.13.orig.tar.gz
+sha256  d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f  cvs_1.12.13-12+squeeze1.diff.gz
+
+# Hash for license files, locally computed
+sha256  569c5b876327d899cf444b2277fe910128a38ca71d90755fe4125dd44f8ece02  COPYING
+sha256  da0e282103fb508894e78db519aab255e36971ce0bc87de585e3b05014b83b1e  COPYING.LIB
+sha256  ee9a2fbdb626c0ac57fd8e569f357eb2e6d6c80cc6f41efa8bd126d5ea589d72  lib/glob-libc.h

buildroot/package/cvs/cvs.mk

@@ -8,6 +8,8 @@ CVS_VERSION = 1.12.13
 CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz
 CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz
 CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs
+CVS_LICENSE = GPL-1.0+, LGPL-2.0+, LGPL-2.1+ (glob)
+CVS_LICENSE_FILES = COPYING COPYING.LIB lib/glob-libc.h
 CVS_DEPENDENCIES = ncurses
 
 CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes

buildroot/package/docker-cli/docker-cli.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad  docker-cli-19.03.5.tar.gz
+sha256	36dd85273c95f4755e08b37ea9660a1bf5c315570b679a0ce268750ca1ed3801  docker-cli-19.03.8.tar.gz
 sha256	2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0  LICENSE

buildroot/package/docker-cli/docker-cli.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CLI_VERSION = 19.03.5
+DOCKER_CLI_VERSION = 19.03.8
 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
 DOCKER_CLI_WORKSPACE = gopath
 

buildroot/package/docker-containerd/docker-containerd.hash

@@ -1,3 +1,3 @@
 # Computed locally
-sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41  docker-containerd-1.2.12.tar.gz
+sha256	0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4  docker-containerd-1.2.13.tar.gz
 sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE

buildroot/package/docker-containerd/docker-containerd.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = 1.2.12
+DOCKER_CONTAINERD_VERSION = 1.2.13
 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE

buildroot/package/docker-engine/docker-engine.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637  docker-engine-19.03.5.tar.gz
+sha256	13ec45ad45091111bd566aca9d81989b3f05e0625dab68d33c3ad81ff924172f  docker-engine-19.03.8.tar.gz
 sha256	7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8  LICENSE

buildroot/package/docker-engine/docker-engine.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = 19.03.5
+DOCKER_ENGINE_VERSION = 19.03.8
 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0

buildroot/package/docker-proxy/docker-proxy.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d	docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
+sha256	2e1fdcc401a22d53103be6cfb5475c40af9f9a82a996ec6d508e0994dc2c5e4a	docker-proxy-1ea375d2b54d2e914e41970a04553ad55ef39b62.tar.gz
 sha256  cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14	LICENSE

buildroot/package/docker-proxy/docker-proxy.mk

@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e
-DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
+DOCKER_PROXY_VERSION = 1ea375d2b54d2e914e41970a04553ad55ef39b62
+DOCKER_PROXY_SITE = $(call github,moby,libnetwork,$(DOCKER_PROXY_VERSION))
 
 DOCKER_PROXY_LICENSE = Apache-2.0
 DOCKER_PROXY_LICENSE_FILES = LICENSE

buildroot/package/domoticz/domoticz.mk

@@ -33,6 +33,9 @@ DOMOTICZ_CONF_OPTS += \
 
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 DOMOTICZ_DEPENDENCIES += libusb
+DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=ON
+else
+DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENZWAVE),y)

buildroot/package/e2fsprogs/e2fsprogs.hash

@@ -1,5 +1,5 @@
-# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.5/sha256sums.asc
-sha256  f9faccc0d90f73556e797dc7cc5979b582bd50d3f8609c0f2ad48c736d44aede  e2fsprogs-1.45.5.tar.xz
+# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.6/sha256sums.asc
+sha256  ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256  e2fsprogs-1.45.6.tar.xz
 # Locally calculated
 sha256  5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020  NOTICE
 sha256  032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d  lib/ss/mit-sipb-copyright.h

buildroot/package/e2fsprogs/e2fsprogs.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-E2FSPROGS_VERSION = 1.45.5
+E2FSPROGS_VERSION = 1.45.6
 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
 E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)

buildroot/package/efl/efl.mk

@@ -257,6 +257,8 @@ EFL_CONF_OPTS += --disable-image-loader-webp
 endif
 
 ifeq ($(BR2_PACKAGE_POPPLER),y)
+# poppler needs c++11
+EFL_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 EFL_DEPENDENCIES += poppler
 EFL_CONF_OPTS += --enable-poppler
 else

buildroot/package/evtest/Config.in

@@ -6,4 +6,4 @@ config BR2_PACKAGE_EVTEST
 	  device. It then monitors the device and displays all the
 	  events layer events generated.
 
-	  http://cgit.freedesktop.org/evtest
+	  https://gitlab.freedesktop.org/libevdev/evtest