New way to install/run supervisor + plugins (#620)

* Use new layout for CLI/Supervisor

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

* Fix install script

* Fix config

* Add docs

* Fix shellcheck

* Fix issue

* rename package

* Fix build

* Fix apparmor

Documentation/development.md

@@ -27,3 +27,28 @@ We support mainly uboot but for uefi system we can also use barebox. In future w
 `DISK_SIZE`:
 Default 2. That is the size of end image in GB.
 
+## Supervisor
+
+`SUPERVISOR_MACHINE`:
+- intel-nuc
+- odroid-c2
+- odroid-n2
+- odroid-xu
+- qemuarm
+- qemuarm-64
+- qemux86
+- qemux86-64
+- raspberrypi
+- raspberrypi2
+- raspberrypi3
+- raspberrypi4
+- raspberrypi3-64
+- raspberrypi4-64
+- tinker
+
+`SUPERVISOR_ARCH`
+- amd64
+- i386
+- armhf
+- armv7
+- aarch64

buildroot-external/Config.in

@@ -1,4 +1,4 @@
-source "$BR2_EXTERNAL_HASSOS_PATH/package/hassos/Config.in"
+source "$BR2_EXTERNAL_HASSOS_PATH/package/hassio/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/libapparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/apparmor/Config.in"
 source "$BR2_EXTERNAL_HASSOS_PATH/package/bluetooth-bcm43xx/Config.in"

buildroot-external/board/asus/tinker/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=true
 BOOT_ENV_SIZE=0x8000
+SUPERVISOR_MACHINE=tinker
+SUPERVISOR_ARCH=armv7

buildroot-external/board/hardkernel/odroid-c2/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=Image
 BOOT_SYS=mbr
 BOOT_SPL=true
 BOOT_ENV_SIZE=0x2000
+SUPERVISOR_MACHINE=odroid-c2
+SUPERVISOR_ARCH=aarch64

buildroot-external/board/hardkernel/odroid-n2/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=Image
 BOOT_SYS=mbr
 BOOT_SPL=true
 BOOT_ENV_SIZE=0x2000
+SUPERVISOR_MACHINE=odroid-n2
+SUPERVISOR_ARCH=aarch64

buildroot-external/board/hardkernel/odroid-xu4/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=mbr
 BOOT_SPL=true
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=odroid-xu
+SUPERVISOR_ARCH=armv7

buildroot-external/board/intel/nuc/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=bzImage
 BOOT_SYS=efi
 BOOT_SPL=false
 DISK_SIZE=6
+SUPERVISOR_MACHINE=intel-nuc
+SUPERVISOR_ARCH=amd64

buildroot-external/board/intel/ova/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=bzImage
 BOOT_SYS=efi
 BOOT_SPL=false
 DISK_SIZE=6
+SUPERVISOR_MACHINE=qemux86-64
+SUPERVISOR_ARCH=amd64

buildroot-external/board/raspberrypi/rpi/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi
+SUPERVISOR_ARCH=armhf

buildroot-external/board/raspberrypi/rpi0-w/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi
+SUPERVISOR_ARCH=armhf

buildroot-external/board/raspberrypi/rpi2/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi2
+SUPERVISOR_ARCH=armhf

buildroot-external/board/raspberrypi/rpi3-64/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=Image
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi3-64
+SUPERVISOR_ARCH=aarch64

buildroot-external/board/raspberrypi/rpi3/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi3
+SUPERVISOR_ARCH=armv7

buildroot-external/board/raspberrypi/rpi4-64/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=Image
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi4-64
+SUPERVISOR_ARCH=aarch64

buildroot-external/board/raspberrypi/rpi4/meta

@@ -6,3 +6,5 @@ KERNEL_FILE=zImage
 BOOT_SYS=hyprid
 BOOT_SPL=false
 BOOT_ENV_SIZE=0x4000
+SUPERVISOR_MACHINE=raspberrypi4
+SUPERVISOR_ARCH=armv7

buildroot-external/configs/intel_nuc_defconfig

@@ -99,15 +99,6 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="amd64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/intel-nuc-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/odroid_c2_defconfig

@@ -93,17 +93,8 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-c2-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_C2=y

buildroot-external/configs/odroid_n2_defconfig

@@ -93,17 +93,8 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-n2-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_N2=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -98,17 +98,8 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armv7"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/odroid-xu-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_HARDKERNEL_BOOT=y
 BR2_PACKAGE_HARDKERNEL_BOOT_ODROID_XU4=y

buildroot-external/configs/ova_defconfig

@@ -90,15 +90,6 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="amd64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qemux86-64-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi0_w_defconfig

@@ -96,16 +96,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armhf"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi2_defconfig

@@ -95,15 +95,6 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armhf"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/rpi3_64_defconfig

@@ -96,16 +96,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-64-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi3_defconfig

@@ -96,16 +96,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armv7"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi4_64_defconfig

@@ -97,16 +97,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="aarch64"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-64-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi4_defconfig

@@ -97,16 +97,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armv7"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_BCM43XX=y

buildroot-external/configs/rpi_defconfig

@@ -95,15 +95,6 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armhf"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y

buildroot-external/configs/tinker_defconfig

@@ -100,16 +100,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GPTFDISK=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_RAUC=y
-BR2_PACKAGE_HASSOS=y
+BR2_PACKAGE_HASSIO=y
-BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor"
+BR2_PACKAGE_HASSIO_ARCH="armv7"
-BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="209"
-BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor"
-BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt"
-BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli"
-BR2_PACKAGE_HASSOS_CLI_VERSION="21"
-BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host supervisor:172.30.32.2"
-BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default"
-BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor"
 BR2_PACKAGE_APPARMOR=y
 BR2_PACKAGE_BLUETOOTH_RTL8723=y

buildroot-external/package/hassio/Config.in

@@ -0,0 +1,16 @@
+menuconfig BR2_PACKAGE_HASSIO
+	bool "Supervisor App"
+	help
+	  This is the Application layer they build the
+	  data partition with configurations.
+
+	  https://github.com/home-assistant/supervisor
+
+if BR2_PACKAGE_HASSIO
+
+config BR2_PACKAGE_HASSIO_ARCH
+	string "Supervisor Arch"
+	help
+	  Supervisor architecture which should be pull.
+
+endif

buildroot-external/package/hassio/builder/Dockerfile

@@ -8,12 +8,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
         ca-certificates \
         curl \
+        jq \
         gpg-agent \
         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" \
     && apt-get update && apt-get install -y --no-install-recommends \
-        docker-ce=5:19.03.5~3-0~ubuntu-bionic \
+        docker-ce docker-ce-cli containerd.io \
     && rm -rf /var/lib/apt/lists/*
 
 COPY hostapp.sh /usr/bin/

buildroot-external/package/hassio/builder/hostapp.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+set -e
+
+ARCH=
+DATA_IMG="/export/data.ext4"
+VERSION_URL="https://version.home-assistant.io/stable.json"
+APPARMOR_URL="https://version.home-assistant.io/apparmor.txt"
+
+# Parse
+while [[ $# -gt 0 ]]; do
+    key=$1
+    case $key in 
+        --arch)
+            ARCH=$2
+            shift
+            ;;
+        *)
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+SUPERVISOR="homeassistant/${ARCH}-hassio-supervisor"
+DNS="homeassistant/${ARCH}-hassio-dns"
+AUDIO="homeassistant/${ARCH}-hassio-audio"
+CLI="homeassistant/${ARCH}-hassio-cli"
+MULTICAST="homeassistant/${ARCH}-hassio-multicast"
+
+SUPERVISOR_VERSION=$(curl -s ${VERSION_URL} | jq -e -r '.supervisor')
+DNS_VERSION=$(curl -s ${VERSION_URL} | jq -e -r '.dns')
+CLI_VERSION=$(curl -s ${VERSION_URL} | jq -e -r '.cli')
+AUDIO_VERSION=$(curl -s ${VERSION_URL} | jq -e -r '.audio')
+MULTICAST_VERSION=$(curl -s ${VERSION_URL} | jq -e -r '.multicast')
+
+# Make image
+dd if=/dev/zero of=${DATA_IMG} bs=1G count=1
+mkfs.ext4 -L "hassos-data" -E lazy_itable_init=0,lazy_journal_init=0 ${DATA_IMG}
+
+# Setup local user
+if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then
+  groupadd -g "${BUILDER_GID}" builder
+  useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker builder
+  chown builder:builder ${DATA_IMG}
+fi
+
+# Mount / init file structs
+mkdir -p /mnt/data/
+mount -o loop ${DATA_IMG} /mnt/data
+mkdir -p /mnt/data/docker
+
+# Run dockerd
+dockerd -s overlay2 -g /mnt/data/docker &
+DOCKER_PID=$!
+
+DOCKER_COUNT=0
+until docker info >/dev/null 2>&1; do
+    if [ ${DOCKER_COUNT} -gt 30 ]; then
+        exit 1
+    fi
+        
+    sleep 1
+    DOCKER_COUNT=$((DOCKER_COUNT + 1))
+done
+
+# Install supervisor
+docker pull "${SUPERVISOR}:${SUPERVISOR_VERSION}"
+docker tag "${SUPERVISOR}:${SUPERVISOR_VERSION}" "${SUPERVISOR}:latest"
+
+# Install Plugins
+docker pull "${CLI}:${CLI_VERSION}"
+docker pull "${DNS}:${DNS_VERSION}"
+docker pull "${AUDIO}:${AUDIO_VERSION}"
+docker pull "${MULTICAST}:${MULTICAST_VERSION}"
+
+# Setup AppArmor
+mkdir -p "/mnt/data/supervisor/apparmor"
+curl -sL -o "/mnt/data/supervisor/apparmor/hassio-supervisor" "${APPARMOR_URL}"
+
+# Finish
+kill $DOCKER_PID && wait $DOCKER_PID
+
+# Unmount resource
+if ! umount /mnt/data; then
+    umount -f /mnt/data || echo "umount force fails!"
+fi
+
+exit 0

buildroot-external/package/hassio/hassio.mk

@@ -0,0 +1,25 @@
+################################################################################
+#
+# HassOS
+#
+################################################################################
+
+HASSIO_VERSION = 1.0.0
+HASSIO_LICENSE = Apache License 2.0
+HASSIO_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
+HASSIO_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/hassio
+HASSIO_SITE_METHOD = local
+
+define HASSIO_BUILD_CMDS
+	docker build --tag hassos-hostapps $(@D)/builder
+endef
+
+define HASSIO_INSTALL_TARGET_CMDS
+	docker run --rm --privileged \
+		-e BUILDER_UID="$(shell id -u)" -e BUILDER_GID="$(shell id -g)" \
+		-v $(BINARIES_DIR):/export \
+		hassos-hostapps \
+		--arch $(BR2_PACKAGE_HASSIO_ARCH)
+endef
+
+$(eval $(generic-package))

buildroot-external/package/hassos/Config.in

@@ -1,66 +0,0 @@
-menuconfig BR2_PACKAGE_HASSOS
-	bool "hassos-app"
-	help
-	  This is the Application layer they build the
-	  data partition with configurations.
-
-	  https://github.com/home-assistant/hassos
-
-if BR2_PACKAGE_HASSOS
-
-config BR2_PACKAGE_HASSOS_SUPERVISOR
-	string "supervisor docker image"
-	help
-	  Name of supervisor docker image they will be build in.
-
-config BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION
-	string "supervisor docker image version"
-	help
-	  Version of supervisor docker image they will be build in.
-
-config BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS
-	string "supervisor docker arguments"
-	help
-	  Extended docker arguments to run the supervisor.
-
-config BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE
-	string "AppArmor supervisor profile"
-	help
-	  AppArmor profile for supervisor.
-
-config BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL
-	string "AppArmor supervisor profile URL"
-	help
-	  AppArmor profile for supervisor url.
-
-config BR2_PACKAGE_HASSOS_CLI
-	string "cli docker image"
-	help
-	  Name of cli docker image they will be build in.
-
-config BR2_PACKAGE_HASSOS_CLI_VERSION
-	string "cli docker image version"
-	help
-	  Version of cli docker image they will be build in.
-
-config BR2_PACKAGE_HASSOS_CLI_ARGS
-	string "cli docker arguments"
-	help
-	  Extended docker arguments to run the cli.
-
-config BR2_PACKAGE_HASSOS_CLI_PROFILE
-	string "AppArmor cli profile"
-	help
-	  AppArmor profile for cli.
-
-config BR2_PACKAGE_HASSOS_CLI_PROFILE_URL
-	string "AppArmor cli profile url"
-	help
-	  AppArmor profile for cli url.
-
-config BR2_PACKAGE_HASSOS_APPARMOR_DIR
-	string "AppArmor profiles folder"
-	help
-	  AppArmor profiles folder for HassOS.
-
-endif

buildroot-external/package/hassos/builder/hostapp.sh

@@ -1,146 +0,0 @@
-#!/bin/bash
-set -e
-
-SUPERVISOR=""
-SUPERVISOR_VERSION=""
-SUPERVISOR_ARGS=""
-SUPERVISOR_PROFILE=""
-SUPERVISOR_PROFILE_URL=""
-CLI=""
-CLI_VERSION=""
-CLI_ARGS=""
-CLI_PROFILE=""
-CLI_PROFILE_URL=""
-APPARMOR=""
-DATA_IMG="/export/data.ext4"
-
-# Parse
-while [[ $# -gt 0 ]]; do
-    key=$1
-    case $key in 
-        --supervisor)
-            SUPERVISOR=$2
-            shift
-            ;;
-        --supervisor-version)
-            SUPERVISOR_VERSION=$2
-            shift
-            ;;
-        --supervisor-args)
-            SUPERVISOR_ARGS=$2
-            shift
-            ;;
-        --supervisor-profile)
-            SUPERVISOR_PROFILE=$2
-            shift
-            ;;
-        --supervisor-profile-url)
-            SUPERVISOR_PROFILE_URL=$2
-            shift
-            ;;
-        --cli)
-            CLI=$2
-            shift
-            ;;
-        --cli-version)
-            CLI_VERSION=$2
-            shift
-            ;;
-        --cli-args)
-            CLI_ARGS=$2
-            shift
-            ;;
-        --cli-profile)
-            CLI_PROFILE=$2
-            shift
-            ;;
-        --cli-profile-url)
-            CLI_PROFILE_URL=$2
-            shift
-            ;;
-        --apparmor)
-            APPARMOR=$2
-            shift
-            ;;
-        *)
-            exit 1
-            ;;
-    esac
-    shift
-done
-
-# Make image
-dd if=/dev/zero of=${DATA_IMG} bs=1G count=1
-mkfs.ext4 -L "hassos-data" -E lazy_itable_init=0,lazy_journal_init=0 ${DATA_IMG}
-
-# Setup local user
-if [ "${BUILDER_UID:0}" -ne 0 ] && [ "${BUILDER_GID:0}" -ne 0 ]; then
-  groupadd -g "${BUILDER_GID}" builder
-  useradd -m -u "${BUILDER_UID}" -g "${BUILDER_GID}" -G docker builder
-  chown builder:builder ${DATA_IMG}
-fi
-
-# Mount / init file structs
-mkdir -p /mnt/data/
-mount -o loop ${DATA_IMG} /mnt/data
-mkdir -p /mnt/data/docker
-
-# Run dockerd
-dockerd -s overlay2 -g /mnt/data/docker &
-DOCKER_PID=$!
-
-DOCKER_COUNT=0
-until docker info >/dev/null 2>&1; do
-    if [ ${DOCKER_COUNT} -gt 30 ]; then
-        exit 1
-    fi
-        
-    sleep 1
-    DOCKER_COUNT=$((DOCKER_COUNT + 1))
-done
-
-# Install supervisor
-docker pull "${SUPERVISOR}:${SUPERVISOR_VERSION}"
-docker tag "${SUPERVISOR}:${SUPERVISOR_VERSION}" "${SUPERVISOR}:latest"
-
-# Install cli
-docker pull "${CLI}:${CLI_VERSION}"
-docker tag "${CLI}:${CLI_VERSION}" "${CLI}:latest"
-
-# Write config
-cat > /mnt/data/hassos.json <<- EOF
-{
-    "supervisor": "${SUPERVISOR}",
-    "supervisor_args": "${SUPERVISOR_ARGS}",
-    "supervisor_apparmor": "${SUPERVISOR_PROFILE}",
-    "cli": "${CLI}",
-    "cli_args": "${CLI_ARGS}",
-    "cli_apparmor": "${CLI_PROFILE}",
-    "apparmor": "${APPARMOR}"
-}
-EOF
-
-# Setup AppArmor
-if [ -n "${APPARMOR}" ]; then
-    mkdir -p "/mnt/data/${APPARMOR}"
-
-    # Supervisor
-    if [ -n "${SUPERVISOR_PROFILE_URL}" ]; then
-        curl -sL -o "/mnt/data/${APPARMOR}/${SUPERVISOR_PROFILE}" "${SUPERVISOR_PROFILE_URL}"
-    fi
-
-    # CLI
-    if [ -n "${CLI_PROFILE_URL}" ]; then
-        curl -sL -o "/mnt/data/${APPARMOR}/${CLI_PROFILE}" "${CLI_PROFILE_URL}"
-    fi
-fi
-
-# Finish
-kill $DOCKER_PID && wait $DOCKER_PID
-
-# Unmount resource
-if ! umount /mnt/data; then
-    umount -f /mnt/data || echo "umount force fails!"
-fi
-
-exit 0

buildroot-external/package/hassos/hassos.mk

@@ -1,35 +0,0 @@
-################################################################################
-#
-# HassOS
-#
-################################################################################
-
-HASSOS_VERSION = 1.0.0
-HASSOS_LICENSE = Apache License 2.0
-HASSOS_LICENSE_FILES = $(BR2_EXTERNAL_HASSOS_PATH)/../LICENSE
-HASSOS_SITE = $(BR2_EXTERNAL_HASSOS_PATH)/package/hassos
-HASSOS_SITE_METHOD = local
-
-define HASSOS_BUILD_CMDS
-	docker build --tag hassos-hostapps $(@D)/builder
-endef
-
-define HASSOS_INSTALL_TARGET_CMDS
-	docker run --rm --privileged \
-		-e BUILDER_UID="$(shell id -u)" -e BUILDER_GID="$(shell id -g)" \
-		-v $(BINARIES_DIR):/export \
-		hassos-hostapps \
-		--supervisor $(BR2_PACKAGE_HASSOS_SUPERVISOR) \
-		--supervisor-version $(BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION) \
-		--supervisor-args $(BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS) \
-		--supervisor-profile $(BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE) \
-		--supervisor-profile-url $(BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL) \
-		--cli $(BR2_PACKAGE_HASSOS_CLI) \
-		--cli-version $(BR2_PACKAGE_HASSOS_CLI_VERSION) \
-		--cli-args $(BR2_PACKAGE_HASSOS_CLI_ARGS) \
-		--cli-profile $(BR2_PACKAGE_HASSOS_CLI_PROFILE) \
-		--cli-profile-url $(BR2_PACKAGE_HASSOS_CLI_PROFILE_URL) \
-		--apparmor $(BR2_PACKAGE_HASSOS_APPARMOR_DIR)
-endef
-
-$(eval $(generic-package))

buildroot-external/rootfs-overlay/usr/bin/ha

@@ -0,0 +1,7 @@
+#!/bin/sh
+# ==============================================================================
+# HA utility
+# ==============================================================================
+
+# shellcheck disable=SC2048,SC2086
+docker exec hassio_cli ha $*

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

@@ -1,16 +1,7 @@
 #!/bin/sh
 set -e
 
-# Load configs
+PROFILES_DIR="/mnt/data/supervisor/apparmor"
-CONFIG_FILE=/mnt/data/hassos.json
-
-# Read configs
-PROFILES_DIR="$(jq --raw-output '.apparmor // empty' ${CONFIG_FILE})"
-if [ -z "${PROFILES_DIR}" ]; then
-    exit 0
-fi
-
-PROFILES_DIR="/mnt/data/${PROFILES_DIR}"
 CACHE_DIR="${PROFILES_DIR}/cache"
 REMOVE_DIR="${PROFILES_DIR}/remove"
 

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

@@ -1,24 +1,11 @@
 #!/bin/sh
+# ==============================================================================
+# Run logging cli
+# ==============================================================================
 
-# Load configs
+docker container exec \
-CONFIG_FILE=/mnt/data/hassos.json
+    -ti hassio_cli \
-
+    /usr/bin/cli.sh \
-CLI="$(jq --raw-output '.cli' ${CONFIG_FILE})"
-DOCKER_ARGS="$(jq --raw-output '.cli_args // empty' ${CONFIG_FILE})"
-APPARMOR="$(jq --raw-output '.cli_apparmor // "docker-default"' ${CONFIG_FILE})"
-
-CLI_DATA=/mnt/data/cli
-mkdir -p ${CLI_DATA}
-
-# Run CLI
-# shellcheck disable=SC2086
-docker container run \
-    --rm -ti --init \
-    --security-opt apparmor="${APPARMOR}" \
-    -v ${CLI_DATA}:/data \
-    -v /etc/machine-id:/etc/machine-id:ro \
-    $DOCKER_ARGS \
-    "${CLI}"
 
 # Jump to root login shell
 if [ $? -eq 10 ]; then

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

@@ -1,39 +1,35 @@
 #!/bin/sh
+# shellcheck disable=SC1091
+# ==============================================================================
+# Supervisor on HassOS
+# ==============================================================================
 set -e
 
 # Load configs
-CONFIG_FILE=/mnt/data/hassos.json
+. /etc/os-release
-
-SUPERVISOR="$(jq --raw-output '.supervisor' ${CONFIG_FILE})"
-DOCKER_ARGS="$(jq --raw-output '.supervisor_args // empty' ${CONFIG_FILE})"
-APPARMOR="$(jq --raw-output '.supervisor_apparmor // "docker-default"' ${CONFIG_FILE})"
 
 # Init supervisor
-HASSOS_DATA=/mnt/data/supervisor
+SUPERVISOR_IMAGE="homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor"
-HASSOS_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR}")
+SUPERVISOR_DATA=/mnt/data/supervisor
-HASSOS_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassos_supervisor || echo "")
+SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}")
-
+SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
-# Fix wrong AppArmor profiles
-if ! grep "${APPARMOR}" /sys/kernel/security/apparmor/profiles > /dev/null; then
-    APPARMOR=docker-default
-fi
 
 runSupervisor() {
-    docker container rm --force hassos_supervisor || true
+    docker container rm --force hassio_supervisor || true
 
     # shellcheck disable=SC2086
-    docker container run --name hassos_supervisor \
+    docker container run --name hassio_supervisor \
-        --privileged --security-opt apparmor="${APPARMOR}" \
+        --privileged --security-opt apparmor="hassio-supervisor" \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v /var/run/dbus:/var/run/dbus \
         -v /etc/machine-id:/etc/machine-id:ro \
-        -v ${HASSOS_DATA}:/data \
+        -v ${SUPERVISOR_DATA}:/data \
-        -e SUPERVISOR_SHARE=${HASSOS_DATA} \
+        -e SUPERVISOR_SHARE=${SUPERVISOR_DATA} \
-        -e SUPERVISOR_NAME=hassos_supervisor \
+        -e SUPERVISOR_NAME=hassio_supervisor \
-        $DOCKER_ARGS \
+        -e SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE} \
-        "${SUPERVISOR}"
+        "${SUPERVISOR_IMAGE}"
 }
 
 # Run supervisor
-mkdir -p ${HASSOS_DATA}
+mkdir -p ${SUPERVISOR_DATA}
-([ "${HASSOS_IMAGE_ID}" = "${HASSOS_CONTAINER_ID}" ] && docker container start --attach hassos_supervisor) || runSupervisor
+([ "${SUPERVISOR_IMAGE_ID}" = "${SUPERVISOR_CONTAINER_ID}" ] && docker container start --attach hassio_supervisor) || runSupervisor

buildroot-external/scripts/post-build.sh

@@ -30,6 +30,8 @@ install_hassos_cli
     echo "HOME_URL=https://hass.io/"
     echo "VARIANT=\"${HASSOS_NAME} ${BOARD_NAME}\""
     echo "VARIANT_ID=${BOARD_ID}"
+    echo "SUPERVISOR_MACHINE=${SUPERVISOR_MACHINE}"
+    echo "SUPERVISOR_ARCH=${SUPERVISOR_ARCH}"
 ) > "${TARGET_DIR}/usr/lib/os-release"
 
 # Write machine-info