Merge pull request #644 from home-assistant/dev

Beta 4.5
Merge pull request #604 from home-assistant/dev
2020-04-29 12:42:26 +02:00 · 2020-03-07 14:08:11 +01:00 · 2020-02-18 13:25:14 +01:00 · 2020-02-06 18:56:35 +01:00 · 2020-02-05 16:58:01 +01:00
384 changed files with 1340 additions and 5279 deletions
--- a/30
+++ b/30
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM ubuntu:18.04

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

 # Init entry
--- a/Documentation/boards/tinker.md
+++ b/Documentation/boards/tinker.md
@@ -5,13 +5,11 @@ Supported Hardware:
 | Device | Board | 
 |--------|-----------|
 | Tinker RK3288 | tinker |
-| Tinker S RK3288 |  |
+| Tinker S RK3288 | tinker |

-<!--
 ## 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

--- a/Documentation/configuration.md
+++ b/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 the `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 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 inserted 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 insterted to the device during this setup process and can be disconnected afterwards.*

 ## Local

@@ -47,9 +47,7 @@ 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
--- a/Documentation/deployment.md
+++ b/Documentation/deployment.md
@@ -15,7 +15,7 @@ The development number they will be bump for the stable release version and the

 The branch `dev` ist the actual development branch and from there we never make a release. The `master` branch contains the development version and from there we build a beta release.

-If we create a new productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.
+If we create a new staging/productive release, we create a new branch `rel-{MAJOR}`. They will be used for the whole cycle of this release.

 ## Upload release files

--- a/Documentation/development.md
+++ b/Documentation/development.md
@@ -3,37 +3,33 @@
 ## Boot system

 `BOOT_SYS`:
-
 - efi
- hybrid
+- hyprid
 - mbr

-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.
+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.

-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.
+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.

 `BOOT_SPL`:
-
 - true
 - false

 Enable SPL update handling.

 `BOOTLOADER`:
-
- U-Boot
+- uboot
 - barebox

-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.
+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.

 `DISK_SIZE`:
-
 Default 2. That is the size of end image in GB.

 ## Supervisor

 `SUPERVISOR_MACHINE`:
-
 - intel-nuc
 - odroid-c2
 - odroid-n2
@@ -50,8 +46,7 @@ Default 2. That is the size of end image in GB.
 - raspberrypi4-64
 - tinker

-`SUPERVISOR_ARCH`:
-
+`SUPERVISOR_ARCH`
 - amd64
 - i386
 - armhf
--- a/Documentation/getting_started_development.md
+++ b/Documentation/getting_started_development.md
@@ -1,10 +1,11 @@
-# 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** 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)
@@ -14,7 +15,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
@@ -29,9 +30,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 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:
+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:

-```bash
+```
 $ cd ~/codebase/hassos/
 $ sudo scripts/enter.sh
 Sending build context to Docker daemon  30.48MB
@@ -42,24 +43,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 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 (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.

-```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
@@ -73,29 +74,33 @@ 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# gunzip release/hassos_ova-2.2.vmdk.gz
+root@fd292c061896:/build# qemu-img convert -O qcow2 release/hassos_ova-2.2.vmdk release/hassos_ova-2.2.qcow2
 root@fd292c061896:/build# ls -lh release/
 total 673M
 -rw-r--r-- 1 root root 337M Oct 10 20:25 hassos_ova-2.2.qcow2
+-rw-r--r-- 1 root root 337M Oct 10 20:22 hassos_ova-2.2.vmdk
 ```

 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 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.)
+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.)

-```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 additional 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 addtional 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! :)
--- a/Documentation/kernel.md
+++ b/Documentation/kernel.md
@@ -5,14 +5,14 @@ Default Kernel tree: 5.4

 | Board | Version |
 |-------|---------|
-| 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 |
+| Open Virtual Applicance | 5.4.35 |
+| Raspberry Pi | 5.4.35 |
+| Raspberry Pi 0-W | 5.4.35 |
+| Raspberry Pi 2 | 5.4.35 |
+| Raspberry Pi 3 | 5.4.35 |
+| Raspberry Pi 4 | 5.4.35 |
+| Tinker Board | 5.4.35 |
+| Odroid-C2 | 5.4.35 |
+| Odroid-N2 | 5.4.35 |
+| Odroid-XU4 | 5.4.35 |
+| Intel NUC | 5.4.35 |
--- a/Documentation/network.md
+++ b/Documentation/network.md
@@ -1,18 +1,15 @@
 # Network

-HassOS uses NetworkManager to control the host 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].

-## Configure network
+## Configuration Examples

-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:
+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:

 ### Default

-A preinstalled connection profile is provided by default:
+We have a preinstalled connection profile:

 ```ini
 [connection]
@@ -28,7 +25,7 @@ addr-gen-mode=stable-privacy
 method=auto
 ```

-### Wired connection to the LAN
+### LAN

 ```ini
 [connection]
@@ -44,7 +41,7 @@ addr-gen-mode=stable-privacy
 method=auto
 ```

-### Wireless LAN WPA/PSK
+### Wireless WPA/PSK

 ```ini
 [connection]
@@ -81,8 +78,7 @@ 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 (after the semicolon) is the IP address of the local gateway.
+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.

 ## Tips

@@ -91,63 +87,59 @@ For `address`, the value before the semicolon is the IP address and subnet prefi
 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 then apply the following changes:
+If you have trouble with powersave you can do following:

 ```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

-## Using `nmcli` to set a static IPv4 address
+Log into the HASSOS base system via a console:

-Log into the the HassOS base system via a console:
-
-```bash
+```
 Welcome to Home Assistant
 homeassistant login:
 ```
+Login as `root` (no password needed)

- Login as `root` (no password needed). At the `ha >` prompt, type `login` (as instructed).
+At the `ha >` prompt, type `login` (as instructed).

-From there you use the `nmcli` configuration tool.
+From here you will use the `nmcli` configuration tool.

- `# 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 connection show` will list the “HassOS default” connection in use.

-To start editing the configuration setting for "HassOS default":
+`# nmcli con show "HassOS default"` will list all the properties of the connection.

-```bash
-# nmcli con edit "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.

 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, 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
+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.
+```
 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 virtual machine or the physical system.
+Doing a `nmcli con reload` does not always work so restart the VM.

-[nm-manual]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
+[keyfile]: https://developer.gnome.org/NetworkManager/stable/nm-settings.html
 [configuration-usb]: configuration.md
 [uuid]: https://www.uuidgenerator.net/
--- a/Documentation/partition.md
+++ b/Documentation/partition.md
@@ -1,47 +0,0 @@
-# Partition
-
-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 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.
-
-A visual representation looks like this:
-
-```text
-------------------------
-|       Bootloader      |
-------------------------
-|       Kernel A        |
-------------------------
-|       System A        |
-|                       |
-------------------------
-|       Kernel B        |
-------------------------
-|       System B        |
-|                       |
-------------------------
-|       Bootstate       |
-------------------------
-|       Overlay         |
-|                       |
-...
-
-------------------------
-|       Data            |
-|                       |
-------------------------
-```
-
-Sometime the bootloader part can look different because there can be firmware or SPLs for boot the CPU on the SoC.
-
-## Data
-
-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 needs to be bigger as the old one and we own the full new drive.
--- a/README.md
+++ b/README.md
@@ -1,18 +1,15 @@
-# Home Assistant Operating system
+[![Build Status](https://dev.azure.com/home-assistant/Hass.io/_apis/build/status/hassos?branchName=dev)](https://dev.azure.com/home-assistant/Hass.io/_build/latest?definitionId=13&branchName=dev)

-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.
+# HassOS
+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.

 ## Focus

 - Barebox as bootloader on EFI
- U-Boot as bootloader
+- U-Boot as bootloader on IoT
 - Linux/Buildroot LTS
 - RAUC for OTA updates
 - SquashFS LZ4 as filesystem
 - Docker-CE
 - AppArmor protected
- ZRAM LZ4 for `/tmp`, `/var` and swap
+- ZRAM LZ4 for /tmp, /var, swap
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -38,15 +38,11 @@ jobs:
      sudo docker pull koalaman/shellcheck:$(versionShellCheck)
    displayName: 'Install ShellCheck'
  - script: |
-      set -e
-
-      # Check build script
      sudo docker run --rm -i \
        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) \
          scripts/*.sh \
          buildroot-external/scripts/*.sh \
          buildroot-external/board/**/*.sh \
-          buildroot-external/rootfs-overlay/usr/bin/* \
          buildroot-external/rootfs-overlay/usr/sbin/* \
          buildroot-external/rootfs-overlay/usr/libexec/* \
          buildroot-external/rootfs-overlay/usr/lib/rauc/*
--- a/buildroot-external/board/asus/tinker/uboot-boot.ush
+++ b/buildroot-external/board/asus/tinker/uboot-boot.ush
@@ -8,7 +8,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"

 run loadbootstate
@@ -17,11 +17,11 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"

 # HassOS system A/B
-setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro rootwait"
-setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro rootwait"
+setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
+setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype=squashfs ro"

 # Load extraargs
 fileenv mmc ${devnum}:1 ${ramdisk_addr_r} cmdline.txt cmdline
--- a/buildroot-external/board/asus/tinker/uboot.config
+++ b/buildroot-external/board/asus/tinker/uboot.config
@@ -1,2 +1,3 @@
 # CONFIG_USB_STORAGE is not set
 # CONFIG_DOS_PARTITION is not set
+CONFIG_DM_VIDEO=y
--- a/buildroot-external/board/hardkernel/kernel-amlogic.config
+++ b/buildroot-external/board/hardkernel/kernel-amlogic.config
@@ -1320,7 +1320,7 @@ CONFIG_PCIE_DW_HOST=y
 # CONFIG_PCIE_DW_PLAT_HOST is not set
 CONFIG_PCI_HISI=y
 CONFIG_PCIE_KIRIN=y
-# CONFIG_PCI_MESON is not set
+CONFIG_PCI_MESON=m
 # CONFIG_PCIE_AL is not set
 # end of DesignWare PCI Core Support
 # end of PCI controller drivers
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot-boot.ush
@@ -10,7 +10,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"

 run loadbootstate
@@ -27,7 +27,7 @@ if test "${m}" = "custombuilt"; then setenv cmode "modeline=${modeline}"; fi
 setenv bootargs_odroidc2 "no_console_suspend hdmimode=${m} ${cmode} m_bpp=${m_bpp} vout=${vout} 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}"

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/odroid-c2/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-c2/uboot.config
@@ -1,3 +1,6 @@
 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
--- a/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-n2/uboot-boot.ush
@@ -10,7 +10,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x2000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    mmc write ${ramdisk_addr_r} ${mmc_env} 0x10;"

 run loadbootstate
@@ -29,7 +29,7 @@ if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}";
 setenv bootargs_odroidn2 "clk_ignore_unused hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} ${cmode} voutmode=${voutmode} disablehpd=${disablehpd} overscan=${overscan}"

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot-boot.ush
@@ -12,7 +12,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    mmc write ${ramdisk_addr_r} ${mmc_env} 0x20;"

 run loadbootstate
@@ -33,7 +33,7 @@ if test "${external_watchdog}" = "true"; then setenv external_watchdog "external
 setenv bootargs_odroidxu4 "${videoconfig} ${hdmi_phy_control} ${hid_quirks} smsc95xx.macaddr=${macaddr} ${external_watchdog}"

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor cgroup_enable=memory"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=48617373-06 rootfstype=squashfs ro rootwait"
--- a/buildroot-external/board/hardkernel/odroid-xu4/uboot.config
+++ b/buildroot-external/board/hardkernel/odroid-xu4/uboot.config
@@ -1,3 +1,4 @@
 CONFIG_DOS_PARTITION=y
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_USB_STORAGE is not set
+CONFIG_DISPLAY_BOARDINFO=y
--- a/buildroot-external/board/hardkernel/patches/linux/0001-FROMLIST-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0001-FROMLIST-clk-meson-g12a-fix-gp0-and-hifi-ranges.patch
@@ -1,39 +0,0 @@
-From 81b290367d59103d1f041709c56a3de1c360e102 Mon Sep 17 00:00:00 2001
-From: Jerome Brunet <jbrunet@baylibre.com>
-Date: Mon, 13 May 2019 14:45:31 +0200
-Subject: [PATCH] FROMLIST: clk: meson: g12a: fix gp0 and hifi ranges
-
-While some SoC samples are able to lock with a PLL factor of 55, others
-samples can't. ATM, a minimum of 60 appears to work on all the samples
-I have tried.
-
-Even with 60, it sometimes takes a long time for the PLL to eventually
-lock. The documentation says that the minimum rate of these PLLs DCO
-should be 3GHz, a factor of 125. Let's use that to be on the safe side.
-
-With factor range changed, the PLL seems to lock quickly (enough) so far.
-It is still unclear if the range was the only reason for the delay.
-
-Fixes: 085a4ea93d54 ("clk: meson: g12a: add peripheral clock controller")
-Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
-Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
- drivers/clk/meson/g12a.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
-index b3af61cc6fb9..66cf791bfc8c 100644
--- a/drivers/clk/meson/g12a.c
-+++ b/drivers/clk/meson/g12a.c
-@@ -1591,7 +1591,7 @@ static struct clk_regmap g12b_cpub_clk_trace = {
- };
- 
- static const struct pll_mult_range g12a_gp0_pll_mult_range = {
-	.min = 55,
-+	.min = 125,
- 	.max = 255,
- };
- 
-- 
-2.17.1
-
--- a/buildroot-external/board/hardkernel/patches/linux/0001-Odroid-N2-arm64-dts-fix-audio-name.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0001-Odroid-N2-arm64-dts-fix-audio-name.patch
--- a/buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch
+++ b/buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch
@@ -1,169 +0,0 @@
-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
-
--- a/buildroot-external/board/intel/nuc/hassos-hook.sh
+++ b/buildroot-external/board/intel/nuc/hassos-hook.sh
@@ -8,7 +8,7 @@ function hassos_pre_image() {
    mkdir -p "${BOOT_DATA}/EFI/barebox"

    cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
-    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"

    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
 }
--- a/buildroot-external/board/intel/ova/hassos-hook.sh
+++ b/buildroot-external/board/intel/ova/hassos-hook.sh
@@ -8,7 +8,7 @@ function hassos_pre_image() {
    mkdir -p "${BOOT_DATA}/EFI/barebox"

    cp "${BINARIES_DIR}/barebox.bin" "${BOOT_DATA}/EFI/BOOT/BOOTx64.EFI"
-    cp "${BR2_EXTERNAL_HASSOS_PATH}/bootloader/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"
+    cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${BOOT_DATA}/EFI/barebox/state.dtb"

    echo "console=tty1" > "${BOOT_DATA}/cmdline.txt"
 }
--- a/buildroot-external/board/intel/ova/home-assistant.ovf
+++ b/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="100" vmw:osType="other4xLinux64Guest">
+    <OperatingSystemSection ovf:id="102" vmw:osType="otherLinux64Guest" ovf:required="false">
      <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:Connection>Bridged</rasd:Connection>
        <rasd:Description>Ethernet adapter</rasd:Description>
+        <rasd:Connection>Bridged</rasd:Connection>
        <rasd:ElementName>eth0</rasd:ElementName>
        <rasd:InstanceID>6</rasd:InstanceID>
        <rasd:ResourceSubType>E1000</rasd:ResourceSubType>
--- a/buildroot-external/board/raspberrypi/patches/linux/0001-rpi-dts-allow-uboot-find-serial.patch
+++ b/buildroot-external/board/raspberrypi/patches/linux/0001-rpi-dts-allow-uboot-find-serial.patch
@@ -1,56 +1,15 @@
-From ece9067567bf0cc938ff09e43dbb3cb00db7fb83 Mon Sep 17 00:00:00 2001
+From b8cabc02384390446cb7f2e34af07b44881246e3 Mon Sep 17 00:00:00 2001
 From: Pascal Vizeli <pvizeli@syshack.ch>
-Date: Tue, 2 Jun 2020 21:20:08 +0000
+Date: Fri, 24 Apr 2020 22:03:34 +0000
 Subject: [PATCH 1/1] rpi-dts: allow uboot find serial

 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
 ---
- arch/arm/boot/dts/bcm2711.dtsi | 8 ++++----
 arch/arm/boot/dts/bcm283x.dtsi | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)

-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 4426f9e6ba92..abcf677fe416 100644
+index 7e95601376d0..82a0ee0d5889 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
@@ -306,7 +306,7 @@
--- a/buildroot-external/board/raspberrypi/uboot-boot.ush
+++ b/buildroot-external/board/raspberrypi/uboot-boot.ush
@@ -9,7 +9,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"

 run loadbootstate
@@ -18,7 +18,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
--- a/buildroot-external/board/raspberrypi/uboot-boot64.ush
+++ b/buildroot-external/board/raspberrypi/uboot-boot64.ush
@@ -9,7 +9,7 @@ setenv loadbootstate " \

 setenv storebootstate " \
    echo 'storing env...'; \
-    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
+    env export -c -s 0x4000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT; \
    ${devtype} write ${ramdisk_addr_r} ${dev_env} 0x20;"

 run loadbootstate
@@ -18,7 +18,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
 test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

 # HassOS bootargs
-setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait systemd.machine_id=${MACHINE_ID} cgroup_enable=memory"
+setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait cgroup_enable=memory"

 # HassOS system A/B
 setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
--- a/buildroot-external/bootloader/barebox/init/global_bootargs
+++ b/buildroot-external/bootloader/barebox/init/global_bootargs
@@ -3,4 +3,3 @@
 global linux.bootargs.zram="zram.enabled=1 zram.num_devices=3"
 global linux.bootargs.apparmor="apparmor=1 security=apparmor"
 global linux.bootargs.misc="rootwait"
-global linux.bootargs.systemd="systemd.machine_id=${state.machine_id}"
--- a/buildroot-external/configs/intel_nuc_defconfig
+++ b/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.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
 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,7 +47,6 @@ 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
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/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/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/f2eb401e73e9b54432cf4234722cb4fad1b334f2.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,7 +38,6 @@ 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
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/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/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/f2eb401e73e9b54432cf4234722cb4fad1b334f2.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,7 +38,6 @@ 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
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/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/237731e3d2c145bd711bd1dcad0479c912b9fb4f.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/f2eb401e73e9b54432cf4234722cb4fad1b334f2.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,7 +41,6 @@ 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
--- a/buildroot-external/configs/ova_defconfig
+++ b/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.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
 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,7 +37,6 @@ 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
--- a/buildroot-external/configs/rpi0_w_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +41,6 @@ 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
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +40,6 @@ 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
@@ -97,5 +96,5 @@ BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSIO_ARCH="armv7"
+BR2_PACKAGE_HASSIO_ARCH="armhf"
 BR2_PACKAGE_APPARMOR=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +41,6 @@ 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
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +41,6 @@ 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
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +42,6 @@ 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
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +42,6 @@ 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
--- a/buildroot-external/configs/rpi_defconfig
+++ b/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/3d1e5203531fd1791762f018538e670bf10f722c.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/9a583229eff3263202522945a594a9115d49fcc6.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,7 +40,6 @@ 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
--- a/buildroot-external/configs/tinker_defconfig
+++ b/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.44"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.35"
 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,7 +42,6 @@ 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
--- a/buildroot-external/meta
+++ b/buildroot-external/meta
@@ -1,7 +1,7 @@
 VERSION_MAJOR=4
-VERSION_BUILD=9
+VERSION_BUILD=5

 HASSOS_NAME="HassOS"
 HASSOS_ID="hassos"

-DEPLOYMENT="production"
+DEPLOYMENT="development"
--- a/buildroot-external/bootloader/barebox-state-efi.dtb
+++ b/buildroot-external/bootloader/barebox-state-efi.dtb
--- a/buildroot-external/bootloader/barebox-state-efi.dts
+++ b/buildroot-external/bootloader/barebox-state-efi.dts
@@ -8,12 +8,11 @@
 	state: state {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		
-		magic = <0xef98423f>;
-		compatible = "barebox,state";
-		backend = <&backend_state>;
-		backend-type = "raw";
-		backend-stridesize = <4048>;
+                magic = <0xef98423f>;
+                compatible = "barebox,state";
+                backend = <&backend_state>;
+                backend-type = "raw";
+                backend-stridesize = <4048>;

 		bootstate {
 			#address-cells = <1>;
@@ -33,7 +32,6 @@
 					default = <20>;
 				};
 			};
-
 			B {
 				#address-cells = <1>;
 				#size-cells = <1>;
@@ -48,18 +46,11 @@
 					default = <10>;
 				};
 			};
-
 			last_chosen@10 {
 				reg = <0x10 0x4>;
 				type = "uint32";
 			};
 		};
-
-		machine_id@14 {
-			reg = <0x14 0x24>;
-			type = "string";
-			default = "";
-		};
 	};

 	partitions {
--- a/buildroot-external/bootloader/mbr-part.rules
+++ b/buildroot-external/bootloader/mbr-part.rules
--- a/buildroot-external/bootloader/mbr-spl.img
+++ b/buildroot-external/bootloader/mbr-spl.img
--- a/buildroot-external/bootloader/mbr.img
+++ b/buildroot-external/bootloader/mbr.img
--- a/buildroot-external/ota/rauc-hook
+++ b/buildroot-external/ota/rauc-hook
@@ -31,5 +31,8 @@ fi
 ##
 # Fixups

+# Rename CLI Hass.io
+sed -i "s/hassio:172.30.32.2/supervisor:172.30.32.2/g" /mnt/data/hassos.json
+

 exit 0
--- a/buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk
+++ b/buildroot-external/package/bluetooth-bcm43xx/bluetooth-bcm43xx.mk
@@ -24,6 +24,7 @@ define BLUETOOTH_BCM43XX_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
 	$(INSTALL) -m 0644 $(@D)/bluetooth-bcm43xx.service $(TARGET_DIR)/usr/lib/systemd/system/
 	$(INSTALL) -m 0644 $(@D)/bthelper@.service $(TARGET_DIR)/usr/lib/systemd/system/
+	ln -fs /usr/lib/systemd/system/bluetooth-bcm43xx.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/

 	$(INSTALL) -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 0755 $(@D)/btuart $(TARGET_DIR)/usr/bin/
--- a/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.mk
+++ b/buildroot-external/package/bluetooth-rtl8723/bluetooth-rtl8723.mk
@@ -21,6 +21,7 @@ define BLUETOOTH_RTL8723_INSTALL_TARGET_CMDS
 	$(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants
 	$(INSTALL) -m 0755 $(@D)/bluetooth-rtl8723 $(TARGET_DIR)/usr/sbin/
 	$(INSTALL) -m 0644 $(@D)/bluetooth-rtl8723.service $(TARGET_DIR)/usr/lib/systemd/system/
+	ln -fs /usr/lib/systemd/system/bluetooth-rtl8723.service $(TARGET_DIR)/etc/systemd/system/hassos-hardware.target.wants/

 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/rtlbt
 	$(INSTALL) -m 0644 $(@D)/rtl8723b_* $(TARGET_DIR)/lib/firmware/rtlbt/
--- a/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk
+++ b/buildroot-external/package/hardkernel-boot/hardkernel-boot.mk
@@ -46,9 +46,9 @@ HARDKERNEL_BOOT_VERSION = c989da31a5c1da3ab57d7c6dc5a3fdbcc1c3eed7

 HARDKERNEL_BOOT_BINS += u-boot.g12b
 define HARDKERNEL_BOOT_BUILD_CMDS
-	curl -L -o $(@D)/fip/blx_fix.sh https://raw.githubusercontent.com/home-assistant/hassos-blobs/d88ec078470f236d694ba1f9e69a44759ddf41ea/odroid-n2/blx_fix_g12a.sh
-	curl -L -o $(@D)/fip/acs.bin https://raw.githubusercontent.com/home-assistant/hassos-blobs/d88ec078470f236d694ba1f9e69a44759ddf41ea/odroid-n2/acs.bin
-	curl -L -o $(@D)/fip/bl301.bin https://raw.githubusercontent.com/home-assistant/hassos-blobs/d88ec078470f236d694ba1f9e69a44759ddf41ea/odroid-n2/bl301.bin
+	curl -L -o $(@D)/fip/blx_fix.sh https://raw.githubusercontent.com/home-assistant/hassos-blobs/d271a9c4aedf740e4fa716c3cb7faee93257e968/odroid-n2/blx_fix_g12a.sh
+	curl -L -o $(@D)/fip/acs.bin https://raw.githubusercontent.com/home-assistant/hassos-blobs/d271a9c4aedf740e4fa716c3cb7faee93257e968/odroid-n2/acs.bin
+	curl -L -o $(@D)/fip/bl301.bin https://raw.githubusercontent.com/home-assistant/hassos-blobs/d271a9c4aedf740e4fa716c3cb7faee93257e968/odroid-n2/bl301.bin

 	bash $(@D)/fip/blx_fix.sh \
 		$(@D)/fip/g12b/bl30.bin $(@D)/fip/zero_tmp $(@D)/fip/bl30_zero.bin \
--- a/buildroot-external/package/hassio/builder/Dockerfile
+++ b/buildroot-external/package/hassio/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster
+FROM ubuntu:18.04

 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -10,11 +10,9 @@ 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/debian/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
+    && 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" \
    && apt-get update && apt-get install -y --no-install-recommends \
        docker-ce docker-ce-cli containerd.io \
    && rm -rf /var/lib/apt/lists/*
--- a/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk
+++ b/buildroot-external/package/qemu-guest-agent/qemu-guest-agent.mk
@@ -19,15 +19,14 @@ QEMU_GUEST_AGENT_DEPENDENCIES = host-pkgconf libglib2 zlib
 # not automatically pulled. :-(
 QEMU_GUEST_AGENT_LIBS = -lrt -lm

-QEMU_GUEST_AGENT_OPTS = -lrt -lm
-
 QEMU_GUEST_AGENT_VARS = LIBTOOL=$(HOST_DIR)/bin/libtool

+QEMU_GUEST_AGENT_OPTS = --enable-guest-agent
+
 # Override CPP, as it expects to be able to call it like it'd
 # call the compiler.
 define QEMU_GUEST_AGENT_CONFIGURE_CMDS
-	unset TARGET_DIR; \
-	cd $(@D); \
+	( cd $(@D); \
 		LIBS='$(QEMU_GUEST_AGENT_LIBS)' \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -53,6 +52,7 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-sdl \
 			--disable-system \
 			--disable-user \
+			--disable-guest-agent \
 			--disable-nettle \
 			--disable-gcrypt \
 			--disable-curses \
@@ -86,18 +86,17 @@ define QEMU_GUEST_AGENT_CONFIGURE_CMDS
 			--disable-blobs \
 			--disable-capstone \
 			--disable-tools \
-			--disable-slirp \
 			--disable-tcg-interpreter \
-			--enable-guest-agent
+			$(QEMU_GUEST_AGENT_OPTS) \
+	)
 endef

 define QEMU_GUEST_AGENT_BUILD_CMDS
-	unset TARGET_DIR; \
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) qemu-ga
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef

 define QEMU_GUEST_AGENT_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 755 $(@D)/qemu-ga $(TARGET_DIR)/usr/libexec/
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_GUEST_AGENT_MAKE_ENV) DESTDIR=$(TARGET_DIR) install
 endef

 define QEMU_GUEST_AGENT_INSTALL_INIT_SYSTEMD
--- a/buildroot-external/package/qemu-guest-agent/qemu-guest.service
+++ b/buildroot-external/package/qemu-guest-agent/qemu-guest.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 ConditionVirtualization=kvm

 [Service]
-ExecStart=/usr/libexec/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0
+ExecStart=/usr/bin/qemu-ga -m virtio-serial -p /dev/virtio-ports/org.qemu.guest_agent.0
 Restart=on-failure

 [Install]
--- a/buildroot-external/patches/linux/0001-loop-Only-change-blocksize-when-needed.patch
+++ b/buildroot-external/patches/linux/0001-loop-Only-change-blocksize-when-needed.patch
@@ -1,46 +0,0 @@
-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
-
--- a/buildroot-external/rootfs-overlay/etc/systemd/journald.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/journald.conf
@@ -1,3 +1,5 @@
 [Journal]
 Storage=auto
 Compress=yes
+SystemMaxUse=12M
+RuntimeMaxUse=10M
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-NetworkManager-system\x2dconnections.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-NetworkManager-system\x2dconnections.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-docker.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-docker.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-docker.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-dropbear.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-dropbear.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-dropbear.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hostname.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hostname.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-hostname.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hosts.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-hosts.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-hosts.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-modules\x2dload.d.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-modules\x2dload.d.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-modules\x2dload.d.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-systemd-timesyncd.conf.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-systemd-timesyncd.conf.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-udev-rules.d.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/etc-udev-rules.d.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/etc-udev-rules.d.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/hassos-user-rules-udev-trigger.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.docker.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.docker.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/root-.docker.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.ssh.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/root-.ssh.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/root-.ssh.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-NetworkManager.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-NetworkManager.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-NetworkManager.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-bluetooth.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-bluetooth.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-bluetooth.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-docker.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-docker.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-docker.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-systemd.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-lib-systemd.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-lib-systemd.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-log-journal.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-bind.target.wants/var-log-journal.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/var-log-journal.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-hardware.target.wants/.empty
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-hardware.target.wants/.empty
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-swap.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-swap.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zram-swap.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-tmp.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-tmp.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zram-tmp.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-var.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/hassos-zram.target.wants/zram-var.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/zram-var.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-expand.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-expand.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-expand.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-overlay.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/hassos-overlay.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-overlay.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-boot.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-boot.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/mnt-boot.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-data.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-data.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/mnt-data.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-overlay.mount
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/local-fs.target.wants/mnt-overlay.mount
@@ -0,0 +1 @@
+/usr/lib/systemd/system/mnt-overlay.mount
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/busybox-acpid.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/busybox-acpid.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/busybox-acpid.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-apparmor.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-apparmor.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-apparmor.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-bind.target
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-bind.target
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-bind.target
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-config.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-config.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-config.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-hardware.target
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-hardware.target
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-hardware.target
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-persists-journald.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-persists-journald.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-persists-journald.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-supervisor.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-supervisor.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-supervisor.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-zram.target
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/hassos-zram.target
@@ -0,0 +1 @@
+/usr/lib/systemd/system/hassos-zram.target
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/rauc.service
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/multi-user.target.wants/rauc.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/rauc.service
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/swap.target.wants/dev-zram0.swap
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/swap.target.wants/dev-zram0.swap
@@ -0,0 +1 @@
+/usr/lib/systemd/system/dev-zram0.swap
--- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/data.conf
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/data.conf
@@ -1,2 +1,2 @@
-d /mnt/data/supervisor - root root -
-R /mnt/data/cli - - - -
+d /mnt/data/supervisor
+d /mnt/data/cli
--- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/nm.conf
@@ -1,3 +1,3 @@
 # Cleanup lease files
 e /var/lib/NetworkManager/*.lease - - - 14d
-f /run/resolv.conf - root root -
+f /run/resolv.conf - - - -
--- a/buildroot-external/rootfs-overlay/etc/tmpfiles.d/overlay.conf
+++ b/buildroot-external/rootfs-overlay/etc/tmpfiles.d/overlay.conf
@@ -1 +0,0 @@
-R /mnt/overlay/var/log/journal - - - -
--- a/buildroot-external/rootfs-overlay/usr/bin/datactl
+++ b/buildroot-external/rootfs-overlay/usr/bin/datactl
@@ -1,31 +0,0 @@
-#!/bin/sh
-# ==============================================================================
-# HassOS data partition handling 
-# ==============================================================================
-set -e
-
-OPTION_FILE=/mnt/overlay/data.opt
-DATA_DEVICE_CHILD="$(findfs LABEL="hassos-data")"
-DATA_DEVICE_ROOT="/dev/$(lsblk -no pkname "${DATA_DEVICE_CHILD}")"
-
-# Move command
-if [ "${1}" = "move" ] && [ -e "${2}" ]; then
-    DEVICE="${2}"
-
-    # Check device
-    if ! lsblk "${DEVICE}" | grep disk > /dev/null 2>&1; then
-        echo "[ERROR] Is not disk!"
-        exit 1
-    elif [ "${DEVICE}" = "${DATA_DEVICE_ROOT}" ]; then
-        echo "[ERROR] Can't be the same disk!"
-        exit 1
-    fi
-
-    # Flag device
-    echo "WARNING: ${DEVICE} will be reset on next restart!"
-    echo "Press a key to move forward"
-    read -r
-
-    echo "${DEVICE}" > ${OPTION_FILE}
-fi
-
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-bind.target
@@ -2,6 +2,3 @@
 Description=HassOS overlay targets
 Documentation=man:systemd.target(5)
 Before=sysinit.target
-
-[Install]
-WantedBy=multi-user.target
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-data.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-data.service
@@ -1,17 +0,0 @@
-[Unit]
-Description=HassOS data partition
-DefaultDependencies=no
-RefuseManualStart=true
-RefuseManualStop=true
-Requires=mnt-overlay.mount dev-disk-by\x2dlabel-hassos\x2ddata.device
-Wants=hassos-expand.service
-After=mnt-overlay.mount dev-disk-by\x2dlabel-hassos\x2ddata.device
-Before=hassos-expand.service
-ConditionPathExists=/mnt/overlay/data.opt
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/hassos-data
-
-[Install]
-WantedBy=local-fs.target
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-expand.service
@@ -10,6 +10,7 @@ After=dev-disk-by\x2dlabel-hassos\x2ddata.device
 [Service]
 Type=oneshot
 ExecStart=/usr/libexec/hassos-expand
+RemainAfterExit=true

 [Install]
 WantedBy=local-fs.target
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-hardware.target
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-hardware.target
@@ -1,6 +1,3 @@
 [Unit]
 Description=HassOS hardware targets
 Documentation=man:systemd.target(5)
-
-[Install]
-WantedBy=multi-user.target
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pascal Vizeli	bbbaff117a	Merge pull request #644 from home-assistant/dev Beta 4.5	2020-04-29 12:42:26 +02:00
Pascal Vizeli	6c58a94a4d	Merge pull request #604 from home-assistant/dev Release 4.4	2020-03-07 14:08:11 +01:00
Pascal Vizeli	2b89de39e3	Merge pull request #589 from home-assistant/dev Release 4.3	2020-02-18 13:25:14 +01:00
Pascal Vizeli	1ca4275698	Merge pull request #573 from home-assistant/dev Release 4.2	2020-02-06 18:56:35 +01:00
Pascal Vizeli	647a461a74	Merge pull request #567 from home-assistant/dev Release 4.1	2020-02-05 16:58:01 +01:00
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/etc-NetworkManager-system\x2dconnections.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/etc-modules\x2dload.d.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/etc-systemd-timesyncd.conf.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/etc-udev-rules.d.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/hassos-user-rules-udev-trigger.service`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/var-lib-NetworkManager.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/var-lib-bluetooth.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/var-lib-docker.mount`
				`@@ -0,0 +1 @@`
				`/usr/lib/systemd/system/var-lib-systemd.mount`