From 9415e2c5d0030a33be839bafa8e4b177c9ad475f Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 21 Feb 2019 16:04:58 +0100 Subject: [PATCH 01/27] Bump version 3.1 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 92f278f13..abcb6db46 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,5 +1,5 @@ VERSION_MAJOR=3 -VERSION_BUILD=0 +VERSION_BUILD=1 HASSOS_NAME="HassOS" HASSOS_ID="hassos" From 7308bad953546a3aea35ef2f95c2a2f8f95300aa Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 22 Feb 2019 00:28:52 +0100 Subject: [PATCH 02/27] Update main.workflow (#362) --- .github/main.workflow | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/main.workflow diff --git a/.github/main.workflow b/.github/main.workflow new file mode 100644 index 000000000..6a7dccd65 --- /dev/null +++ b/.github/main.workflow @@ -0,0 +1,45 @@ +workflow "Shellcheck" { + on = "push" + resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"] +} + +action "Init Shellcheck" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "pull koalaman/shellcheck" +} + +action "Helper Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh" + needs = ["Init Shellcheck"] +} + +action "Buildroot Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh" + needs = ["Init Shellcheck"] +} + +action "Board Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh" + needs = ["Init Shellcheck"] +} + +action "OS/sbin Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*" + needs = ["Init Shellcheck"] +} + +action "OS/libexec Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*" + needs = ["Init Shellcheck"] +} + +action "OS/rauc Scripts" { + uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" + args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*" + needs = ["Init Shellcheck"] +} From ba01ed951b7b56285528ac209795099dc5495621 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 22 Feb 2019 00:51:46 +0100 Subject: [PATCH 03/27] Fix workflow (#363) * Fix workflow * Update rauc.sh * Update rootfs-layer.sh * Delete .travis.yml --- .github/main.workflow | 35 ++++++++-------------- .travis.yml | 25 ---------------- buildroot-external/scripts/rauc.sh | 1 + buildroot-external/scripts/rootfs-layer.sh | 1 + 4 files changed, 14 insertions(+), 48 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/main.workflow b/.github/main.workflow index 6a7dccd65..a20540ba3 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -3,43 +3,32 @@ workflow "Shellcheck" { resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"] } -action "Init Shellcheck" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "pull koalaman/shellcheck" -} - action "Helper Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "scripts/*.sh" } action "Buildroot Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "buildroot-external/scripts/*.sh" } action "Board Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "buildroot-external/board/**/*.sh" } action "OS/sbin Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/*" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "buildroot-external/rootfs-overlay/usr/sbin/*" } action "OS/libexec Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/*" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "buildroot-external/rootfs-overlay/usr/libexec/*" } action "OS/rauc Scripts" { - uses = "actions/docker/cli@8cdf801b322af5f369e00d85e9cf3a7122f49108" - args = "run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/*" - needs = ["Init Shellcheck"] + uses = "actions/bin/shellcheck@master" + args = "buildroot-external/rootfs-overlay/usr/lib/rauc/*" } diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 920bf0e97..000000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -language: bash - -sudo: required -service: docker - -addons: - apt: - packages: - - docker-ce - -before_install: - - shopt -s globstar - - docker pull koalaman/shellcheck - -script: - - docker run -v $(pwd):/mnt koalaman/shellcheck scripts/*.sh - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/scripts/*.sh - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/board/**/*.sh - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/sbin/* - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/libexec/* - - docker run -v $(pwd):/mnt koalaman/shellcheck buildroot-external/rootfs-overlay/usr/lib/rauc/* - -matrix: - fast_finish: true diff --git a/buildroot-external/scripts/rauc.sh b/buildroot-external/scripts/rauc.sh index 20f5d5888..b06748b65 100755 --- a/buildroot-external/scripts/rauc.sh +++ b/buildroot-external/scripts/rauc.sh @@ -78,6 +78,7 @@ function install_rauc_certs() { function install_bootloader_config() { if [ "${BOOTLOADER}" == "uboot" ]; then + # shellcheck disable=SC1117 echo -e "/dev/disk/by-partlabel/hassos-bootstate\t0x0000\t${BOOT_ENV_SIZE}" > "${TARGET_DIR}/etc/fw_env.config" else cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/barebox-state-efi.dtb" "${TARGET_DIR}/etc/barebox-state.dtb" diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index 1c65b83ce..1592c5f80 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/buildroot-external/scripts/rootfs-layer.sh @@ -29,6 +29,7 @@ function fix_rootfs() { function install_hassos_cli() { + # shellcheck disable=SC1117 sed -i "s|\(root.*\)/bin/sh|\1/usr/sbin/hassos-cli|" "${TARGET_DIR}/etc/passwd" if ! grep "hassos-cli" "${TARGET_DIR}/etc/shells"; then From a21871f4afe98dacd85ded446f32f30b28487b16 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 22 Feb 2019 21:24:58 +0100 Subject: [PATCH 04/27] OS: Disable coredump (#365) --- buildroot-external/rootfs-overlay/etc/systemd/coredump.conf | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 buildroot-external/rootfs-overlay/etc/systemd/coredump.conf diff --git a/buildroot-external/rootfs-overlay/etc/systemd/coredump.conf b/buildroot-external/rootfs-overlay/etc/systemd/coredump.conf new file mode 100644 index 000000000..d46fb0960 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/systemd/coredump.conf @@ -0,0 +1,3 @@ +[Coredump] +Storage=none +ProcessSizeMax=0 From 1d40ffd4f9c285cc763a47d42d157f86fab1bb7b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 18 Mar 2019 09:53:22 +0100 Subject: [PATCH 05/27] OS: Fix boot problem (#370) * OS: Fix boot problem * Update var-lib-docker.mount * Update var-lib-docker.mount * Update var-lib-docker.mount --- .../etc/systemd/system/docker.service.d/hassos.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf index cf12227ea..b9b819bb0 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf @@ -1,5 +1,5 @@ [Unit] -RequiresMountsFor=/etc/docker /var/lib/docker +RequiresMountsFor=/etc/docker /mnt/data [Service] ExecStart= From 16fcb84886ee4feb26204f1f30d3eb9d0b69f6a8 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 18 Mar 2019 10:36:25 +0100 Subject: [PATCH 06/27] Update CLI v9 with armv7 (#379) * Update CLI v9 with armv7 * Update rpi2_defconfig --- buildroot-external/configs/intel_nuc_defconfig | 2 +- buildroot-external/configs/odroid_c2_defconfig | 2 +- buildroot-external/configs/odroid_xu4_defconfig | 6 +++--- buildroot-external/configs/opi_prime_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/rpi0_w_defconfig | 2 +- buildroot-external/configs/rpi2_defconfig | 6 +++--- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 6 +++--- buildroot-external/configs/rpi_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 6 +++--- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index b117a8826..2b1d02bc0 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -98,7 +98,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/in BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 3205f6c8f..199701541 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/od BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 8789cf682..4b350c824 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -93,13 +93,13 @@ BR2_PACKAGE_HOST_GPTFDISK=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y -BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" +BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" -BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index d4aee6f49..58bb08928 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -106,7 +106,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/or BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index cf2356f78..8c8bfe585 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -86,7 +86,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qe BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index b9ad65a70..ae4f5dc6f 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -95,7 +95,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 44329f2e1..d73930916 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -88,13 +88,13 @@ BR2_PACKAGE_HOST_GPTFDISK=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y -BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" +BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" -BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 2f161e5a9..5d931ddc3 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -95,7 +95,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index fd65ceaef..f666b5243 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -89,13 +89,13 @@ BR2_PACKAGE_HOST_GPTFDISK=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y -BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" +BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" -BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index ba5d9029f..2bef5d64b 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -94,7 +94,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 9e619d825..5c73d3b7f 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -92,13 +92,13 @@ BR2_PACKAGE_HOST_GPTFDISK=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y -BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" +BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" -BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="8" +BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" +BR2_PACKAGE_HASSOS_CLI_VERSION="9" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" From 454964877d9b418bc3ce26cd9ca6c6b6f7a33a4d Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 18 Mar 2019 12:45:15 +0100 Subject: [PATCH 07/27] Add support for privileged supervisor (#381) --- buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor index 6e93074e9..246a59906 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor @@ -23,7 +23,7 @@ runSupervisor() { # shellcheck disable=SC2086 docker container run --name hassos_supervisor \ - --security-opt apparmor="${APPARMOR}" \ + --privileged --security-opt apparmor="${APPARMOR}" \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/dbus:/var/run/dbus \ -v /etc/machine-id:/etc/machine-id:ro \ From fa20ccdd9493e0b9a5f507f98b743353a087b42f Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 20 Mar 2019 18:10:44 +0100 Subject: [PATCH 08/27] OS: Enable systemd-coredump (#382) --- buildroot-external/configs/intel_nuc_defconfig | 1 + buildroot-external/configs/odroid_c2_defconfig | 1 + buildroot-external/configs/odroid_xu4_defconfig | 1 + buildroot-external/configs/opi_prime_defconfig | 1 + buildroot-external/configs/ova_defconfig | 1 + buildroot-external/configs/rpi0_w_defconfig | 1 + buildroot-external/configs/rpi2_defconfig | 1 + buildroot-external/configs/rpi3_64_defconfig | 1 + buildroot-external/configs/rpi3_defconfig | 1 + buildroot-external/configs/rpi_defconfig | 1 + buildroot-external/configs/tinker_defconfig | 1 + 11 files changed, 11 insertions(+) diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 2b1d02bc0..d4399629b 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -74,6 +74,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 199701541..7b4348369 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 4b350c824..00563ad16 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -72,6 +72,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index 58bb08928..ca679bf4f 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -88,6 +88,7 @@ BR2_PACKAGE_RAUC_NETWORK=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 8c8bfe585..0c0bb2056 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -62,6 +62,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index ae4f5dc6f..3b629242d 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -70,6 +70,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index d73930916..81fb6eb03 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -69,6 +69,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 5d931ddc3..0cab10d7d 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -70,6 +70,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index f666b5243..3e7a74cde 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -70,6 +70,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 2bef5d64b..fbfdac194 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -69,6 +69,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 5c73d3b7f..44d3ad317 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -69,6 +69,7 @@ BR2_PACKAGE_RNG_TOOLS=y # BR2_PACKAGE_SYSTEMD_NETWORKD is not set BR2_PACKAGE_SYSTEMD_RANDOMSEED=y # BR2_PACKAGE_SYSTEMD_RESOLVED is not set +BR2_PACKAGE_SYSTEMD_COREDUMP=y BR2_PACKAGE_UTIL_LINUX_PARTX=y BR2_PACKAGE_UTIL_LINUX_ZRAMCTL=y BR2_TARGET_ROOTFS_SQUASHFS=y From 98b14be0f6568248681cfbcc9315792959ab4c8d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Fri, 5 Apr 2019 12:12:22 +0200 Subject: [PATCH 09/27] OS: Adds universal TUN/TAP kernel support (#390) --- buildroot-external/kernel/hassos.config | 1 + 1 file changed, 1 insertion(+) diff --git a/buildroot-external/kernel/hassos.config b/buildroot-external/kernel/hassos.config index e90a004dc..a7d4967ea 100644 --- a/buildroot-external/kernel/hassos.config +++ b/buildroot-external/kernel/hassos.config @@ -30,6 +30,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_BTRFS_FS is not set +CONFIG_TUN=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y From 267b61405d3c68d582621ffc8c877a8079b5de28 Mon Sep 17 00:00:00 2001 From: Ryan Bray Date: Fri, 5 Apr 2019 08:56:29 -0600 Subject: [PATCH 10/27] Update odroid-xu4.md --- Documentation/boards/odroid-xu4.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/boards/odroid-xu4.md b/Documentation/boards/odroid-xu4.md index c7c9d9914..8f8aa4818 100644 --- a/Documentation/boards/odroid-xu4.md +++ b/Documentation/boards/odroid-xu4.md @@ -12,7 +12,10 @@ The Odroid XU4 has a hidden boot sector that is only visible on the Odroid itsel 2) Clean/wiped/corruped boot sector: * You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above. * Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work.. - +If you are getting permissions issues when using the dd command, try disabling RO: +`echo 0 > /sys/block/mmcblk0boot0/force_ro` +to re-enable after running dd: +`echo 1 > /sys/block/mmcblk0boot0/force_ro` ## Console By default, console access is granted over the serial header and over HDMI. Certain startup messages will only appear on the serial console by default. To show the messages on the HDMI console instead, swap the order of the two consoles in the `cmdline.txt` file on the boot partition. You can also delete the SAC2 console if you don't plan on using the serial adapter. From f0c38a20bc41c0c6539ded39544aa91f08468853 Mon Sep 17 00:00:00 2001 From: Ryan Bray Date: Fri, 5 Apr 2019 09:05:30 -0600 Subject: [PATCH 11/27] Update odroid-xu4.md --- Documentation/boards/odroid-xu4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/boards/odroid-xu4.md b/Documentation/boards/odroid-xu4.md index 8f8aa4818..d590d0cf6 100644 --- a/Documentation/boards/odroid-xu4.md +++ b/Documentation/boards/odroid-xu4.md @@ -12,6 +12,7 @@ The Odroid XU4 has a hidden boot sector that is only visible on the Odroid itsel 2) Clean/wiped/corruped boot sector: * You'll need to follow [Hardkernel's instructions](https://forum.odroid.com/viewtopic.php?f=53&t=6173) to get a working boot sector. Then flash HassOS and follow instructions above. * Alternatively, you can try flash HassOS to both an SD and eMMC, then boot off the SD with the eMMC also plugged in, then run `dd if=/dev/mmcblk1 of=/dev/mmcblk0boot0 bs=512 skip=1 seek=0 count=16381` at the Linux prompt. Note that this is untested, but in theory should work.. + If you are getting permissions issues when using the dd command, try disabling RO: `echo 0 > /sys/block/mmcblk0boot0/force_ro` to re-enable after running dd: From 722f27d3c8463e5d53be737560b1f3ffaadcb4d7 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Tue, 16 Apr 2019 11:05:56 +0200 Subject: [PATCH 12/27] Create stale.yml --- .github/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..dc90e5a1c --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,17 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 60 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 +# Issues with these labels will never be considered stale +exemptLabels: + - pinned + - security +# Label to use when marking an issue as stale +staleLabel: wontfix +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false From 061ab0ed8a9867f104ff805579f5ef81285d12d4 Mon Sep 17 00:00:00 2001 From: Jan Date: Mon, 29 Apr 2019 22:58:03 +0200 Subject: [PATCH 13/27] Added Vmware specific kernel modules to support paravirtualized drivers (#395) This adds VMXNET3 support and the paravirtualized SCSI controller along with virtual sockets for the guest additions and memory ballooning so that unused memory can be shared with other Vmware guests. Tested on ESXi 6.5 and it works great. --- buildroot-external/board/intel/ova/kernel.config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/buildroot-external/board/intel/ova/kernel.config b/buildroot-external/board/intel/ova/kernel.config index c8e118917..72e2e1300 100644 --- a/buildroot-external/board/intel/ova/kernel.config +++ b/buildroot-external/board/intel/ova/kernel.config @@ -1,5 +1,11 @@ CONFIG_EFI_STUB=y +CONFIG_VMXNET3=y +CONFIG_VMWARE_PVSCSI=y +CONFIG_VMWARE_VMCI_VSOCKETS=y +CONFIG_VMWARE_VMCI=y +CONFIG_VMWARE_BALLOON=y + CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_NET=y From d861ecae6fd89914de7b975ea06734c015389458 Mon Sep 17 00:00:00 2001 From: TonyApuzzo Date: Tue, 7 May 2019 10:15:18 -0600 Subject: [PATCH 14/27] Add PROCPS_NG package to enable portainer stats (#398) portainer requires ability to run 'ps -e' which is not supported by busybox's ps. This fixes https://github.com/hassio-addons/addon-portainer/issues/3 Tested on odroid_xu4 target. --- buildroot-external/configs/intel_nuc_defconfig | 1 + buildroot-external/configs/odroid_c2_defconfig | 1 + buildroot-external/configs/odroid_xu4_defconfig | 1 + buildroot-external/configs/opi_prime_defconfig | 1 + buildroot-external/configs/ova_defconfig | 1 + buildroot-external/configs/rpi0_w_defconfig | 1 + buildroot-external/configs/rpi2_defconfig | 1 + buildroot-external/configs/rpi3_64_defconfig | 1 + buildroot-external/configs/rpi3_defconfig | 1 + buildroot-external/configs/rpi_defconfig | 1 + buildroot-external/configs/tinker_defconfig | 1 + 11 files changed, 11 insertions(+) diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index d4399629b..1e0bc64f8 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -28,6 +28,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 7b4348369..1d286f6ac 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -30,6 +30,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 00563ad16..e84fedc8a 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -36,6 +36,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index ca679bf4f..c99ad14a6 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -52,6 +52,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_HASSOS_PATH)/scripts/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/prime $(BR2_EXTERNAL_HASSOS_PATH)/board/orangepi/hassos-hook.sh" BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 0c0bb2056..493fca904 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -27,6 +27,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 3b629242d..ab1e6f598 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 81fb6eb03..8d7d20338 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 0cab10d7d..ba4d9c7af 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 3e7a74cde..3d6844cba 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index fbfdac194..2e301e9f6 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -33,6 +33,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 44d3ad317..4a181cfc5 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -32,6 +32,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_EXTERNAL_HASSOS_PATH)/busybox.config" BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES=y +BR2_PACKAGE_PROCPS_NG=y BR2_PACKAGE_JQ=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y From 5e82060124ebe2655ab00b72c6d6c1578802c1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Kimmerlin?= Date: Wed, 8 May 2019 14:15:48 +0300 Subject: [PATCH 15/27] Adding /etc/modprobe.d folder for module configuration (#397) * Add a /etc/modprobe.d folder populated using a config USB stick with folder modprobe * Add the documentation for the modprobe folder --- Documentation/configuration.md | 8 +++++--- .../rootfs-overlay/etc/modprobe.d/.empty | 0 .../rootfs-overlay/etc/modules-load.d/.empty | 0 .../systemd-modules-load.service.d/hassos.conf | 2 +- .../usr/lib/systemd/system/etc-modprobe.d.mount | 14 ++++++++++++++ .../rootfs-overlay/usr/sbin/hassos-config | 11 ++++++++++- 6 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 buildroot-external/rootfs-overlay/etc/modprobe.d/.empty create mode 100644 buildroot-external/rootfs-overlay/etc/modules-load.d/.empty create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-modprobe.d.mount diff --git a/Documentation/configuration.md b/Documentation/configuration.md index bf20966c7..84880db69 100644 --- a/Documentation/configuration.md +++ b/Documentation/configuration.md @@ -8,18 +8,20 @@ Format a USB stick with FAT32/EXT4/NTFS and name it `CONFIG`. Alternative you ca ```text network/ modules/ +modprobe/ udev/ authorized_keys timesyncd.conf hassos-xy.raucb ``` -- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. +- The `network` folder can contain any kind of NetworkManager connection files. For more information see [Network][network.md]. - The `modules` folder is for modules-load configuration files. +- The `modprobe` folder is for modules configuration files (/etc/modprobe.d) - The `udev` folder is for udev rules files. - The `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Hassio][debug-hassio]. - The `timesyncd.conf` file allow you to set different NTP servers. HassOS won't boot without correct working time servers! -- The `hassos-*.raucb` file is a firmware OTA update which will be installed. These can be found on on the [release][hassos-release] page. +- 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. You can also trigger this process later over the API/UI or by calling `systemctl restart hassos-config` on the host. @@ -32,7 +34,7 @@ You can edit or create a `cmdline.txt` in your boot partition. That will be read ### Kernel-Module -The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. +The kernel module folder `/etc/modules-load.d` is persistent and you can add your configuration files there. See [Systemd modules load][systemd-modules]. You can add the modules configuration files in `/etc/modprobe.d` that is also persistent. ### Udev rules diff --git a/buildroot-external/rootfs-overlay/etc/modprobe.d/.empty b/buildroot-external/rootfs-overlay/etc/modprobe.d/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot-external/rootfs-overlay/etc/modules-load.d/.empty b/buildroot-external/rootfs-overlay/etc/modules-load.d/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-modules-load.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-modules-load.service.d/hassos.conf index 3e1ee64cc..c490b62b8 100644 --- a/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-modules-load.service.d/hassos.conf +++ b/buildroot-external/rootfs-overlay/etc/systemd/system/systemd-modules-load.service.d/hassos.conf @@ -1,2 +1,2 @@ [Unit] -RequiresMountsFor=/etc/modules-load.d +RequiresMountsFor=/etc/modules-load.d /etc/modprobe.d diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-modprobe.d.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-modprobe.d.mount new file mode 100644 index 000000000..2854476d5 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-modprobe.d.mount @@ -0,0 +1,14 @@ +[Unit] +Description=Kernel persistent modprobe.d +Requires=mnt-overlay.mount +After=mnt-overlay.mount +Before=systemd-modules-load.service hassos-config.service + +[Mount] +What=/mnt/overlay/etc/modprobe.d +Where=/etc/modprobe.d +Type=None +Options=bind + +[Install] +WantedBy=hassos-bind.target diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config index 5ae969a0a..08504c53b 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config @@ -44,12 +44,21 @@ fi ## # Modules if [ -d "${CONFIG_DIR}/modules" ]; then - echo "[Info] Update Modules configuration!" + echo "[Info] Update Modules autoload!" rm -rf /etc/modules-load.d/* cp -f ${CONFIG_DIR}/modules/* /etc/modules-load.d/ fi +## +# Modules configuration +if [ -d "${CONFIG_DIR}/modprobe" ]; then + echo "[Info] Update Modules configuration!" + + rm -rf /etc/modprobe.d/* + cp -f ${CONFIG_DIR}/modprobe/* /etc/modprobe.d/ +fi + ## # Udev if [ -d "${CONFIG_DIR}/udev" ]; then From 9a4027e9d4375c4708e5708002814904fd60ba43 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 09:43:43 +0200 Subject: [PATCH 16/27] Delete main.workflow --- .github/main.workflow | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/main.workflow diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index a20540ba3..000000000 --- a/.github/main.workflow +++ /dev/null @@ -1,34 +0,0 @@ -workflow "Shellcheck" { - on = "push" - resolves = ["Buildroot Scripts", "Helper Scripts", "Board Scripts", "OS/sbin Scripts", "OS/libexec Scripts", "OS/rauc Scripts"] -} - -action "Helper Scripts" { - uses = "actions/bin/shellcheck@master" - args = "scripts/*.sh" -} - -action "Buildroot Scripts" { - uses = "actions/bin/shellcheck@master" - args = "buildroot-external/scripts/*.sh" -} - -action "Board Scripts" { - uses = "actions/bin/shellcheck@master" - args = "buildroot-external/board/**/*.sh" -} - -action "OS/sbin Scripts" { - uses = "actions/bin/shellcheck@master" - args = "buildroot-external/rootfs-overlay/usr/sbin/*" -} - -action "OS/libexec Scripts" { - uses = "actions/bin/shellcheck@master" - args = "buildroot-external/rootfs-overlay/usr/libexec/*" -} - -action "OS/rauc Scripts" { - uses = "actions/bin/shellcheck@master" - args = "buildroot-external/rootfs-overlay/usr/lib/rauc/*" -} From 0fb9102e69399ebbfb043a7b728ebd7a1d8af0e5 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 10:00:51 +0200 Subject: [PATCH 17/27] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..073cb008f --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,52 @@ +# https://dev.azure.com/home-assistant + +trigger: + batch: true + branches: + include: + - dev + tags: + include: + - '*' + exclude: + - untagged* +pr: +- dev + +variables: + - name: versionHadolint + value: 'v1.16.3' + - name: versionShellCheck + value: 'v0.6.0' + +jobs: + +- job: 'Hadolint' + pool: + vmImage: 'ubuntu-16.04' + steps: + - script: sudo docker pull hadolint/hadolint:$(versionHadolint) + displayName: 'Install Hadolint' + - script: | + sudo docker run --rm -i \ + -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \ + hadolint/hadolint:$(versionHadolint) < Dockerfile + displayName: 'Run Hadolint' + + +- job: 'ShellCheck' + pool: + vmImage: 'ubuntu-16.04' + steps: + - script: sudo docker pull koalaman/shellcheck:$(versionShellCheck) + displayName: 'Install ShellCheck' + - 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/sbin/* \ + buildroot-external/rootfs-overlay/usr/libexec/* \ + buildroot-external/rootfs-overlay/usr/lib/rauc/* + displayName: 'Run ShellCheck' From e273883077fa21e54cfc8722a10e67a85255eee9 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 10:08:58 +0200 Subject: [PATCH 18/27] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 83c7db240..a771b3227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,8 @@ FROM ubuntu:18.04 +# Set shell +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + # Docker RUN apt-get update && apt-get install -y \ apt-transport-https \ From 6ca35fb1af3ab5863e9874d5e3c4eb06d7cd5f0f Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 10:10:53 +0200 Subject: [PATCH 19/27] Create .hadolint.yaml --- .hadolint.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .hadolint.yaml diff --git a/.hadolint.yaml b/.hadolint.yaml new file mode 100644 index 000000000..8f7e23e45 --- /dev/null +++ b/.hadolint.yaml @@ -0,0 +1,2 @@ +ignored: + - DL3008 From 79dc34c53111457e4a210c72ed77559206a0fe19 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 10:11:42 +0200 Subject: [PATCH 20/27] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a771b3227..d86be8272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:18.04 SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Docker -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --no-install-recommends \ apt-transport-https \ ca-certificates \ curl \ @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # Build Tools -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --no-install-recommends \ wget patch vim cpio python unzip rsync bc bzip2 ncurses-dev \ git make g++ file perl bash binutils locales qemu-utils bison flex \ && rm -rf /var/lib/apt/lists/* From 83a09811138cbb2bc2e665cd8d609a26b75dc2da Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 May 2019 10:14:23 +0200 Subject: [PATCH 21/27] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d86be8272..05f9f8140 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && 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 docker-ce \ + && apt-get update && apt-get install -y --no-install-recommends \ + docker-ce \ && rm -rf /var/lib/apt/lists/* # Build Tools From 1fc912eaf99534423c265c394c49f4b17fd838fe Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 11 May 2019 10:59:36 +0200 Subject: [PATCH 22/27] Create release-drafter.yml --- .github/release-drafter.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/release-drafter.yml diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 000000000..e879f1b55 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,15 @@ +categories: + - title: 'OS' + label: 'os' + - title: 'Build' + label: 'build' + - title: 'Raspberry Pi' + label: 'raspberry' + - title: 'Open Virtual Appliance' + label: 'ova' + - title: 'Intel-Nuc' + label: 'intel-nuc' +template: | + ## Changes + + $CHANGES From ac70f1bfac609f5da90f6768a6863e7333ab5aba Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 11 May 2019 11:01:47 +0200 Subject: [PATCH 23/27] Update release-drafter.yml --- .github/release-drafter.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index e879f1b55..4f7d4c63b 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -4,11 +4,11 @@ categories: - title: 'Build' label: 'build' - title: 'Raspberry Pi' - label: 'raspberry' + label: 'board/raspberry' - title: 'Open Virtual Appliance' - label: 'ova' + label: 'board/ova' - title: 'Intel-Nuc' - label: 'intel-nuc' + label: 'board/intel-nuc' template: | ## Changes From 06e65b5734322d653137155d6e1f05cfd72bb8a8 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 11 May 2019 11:10:00 +0200 Subject: [PATCH 24/27] Update release-drafter.yml --- .github/release-drafter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 4f7d4c63b..beaa89a7a 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,5 +1,5 @@ categories: - - title: 'OS' + - title: 'HassOS Core' label: 'os' - title: 'Build' label: 'build' From 60cf077e48f2fc458e3d7a8948237c906aa9bba4 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 12 May 2019 11:00:07 +0200 Subject: [PATCH 25/27] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 05f9f8140..f4639cfec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ apt-transport-https \ ca-certificates \ curl \ + gpg-agent \ software-properties-common \ && rm -rf /var/lib/apt/lists/* \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ From c9f48797801241dd1ce7caa294132968fb0ce5af Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 12 May 2019 09:02:31 +0000 Subject: [PATCH 26/27] Update Hass.io cli to 11 --- buildroot-external/configs/intel_nuc_defconfig | 2 +- buildroot-external/configs/odroid_c2_defconfig | 2 +- buildroot-external/configs/odroid_xu4_defconfig | 2 +- buildroot-external/configs/opi_prime_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/rpi0_w_defconfig | 2 +- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 1e0bc64f8..2cd16381f 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -100,7 +100,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/in BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 1d286f6ac..856d496db 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -93,7 +93,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/od BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index e84fedc8a..0effc3ecb 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -101,7 +101,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/od BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index c99ad14a6..1454b5892 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -108,7 +108,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/or BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 493fca904..2bf6e2bf6 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -88,7 +88,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/qe BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/amd64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index ab1e6f598..e44611e68 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -97,7 +97,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 8d7d20338..2741a9e9f 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -96,7 +96,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index ba4d9c7af..da27d6531 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -97,7 +97,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/aarch64-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 3d6844cba..30868a08d 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -97,7 +97,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 2e301e9f6..87eba53b4 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -96,7 +96,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ra BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armhf-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index 4a181cfc5..c4b4f6818 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -100,7 +100,7 @@ BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/ti BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" -BR2_PACKAGE_HASSOS_CLI_VERSION="9" +BR2_PACKAGE_HASSOS_CLI_VERSION="11" BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" BR2_PACKAGE_HASSOS_CLI_PROFILE="docker-default" BR2_PACKAGE_HASSOS_APPARMOR_DIR="supervisor/apparmor" From 7439de3d2531772b5fffaaeba6226d571b0507f2 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 12 May 2019 09:03:02 +0000 Subject: [PATCH 27/27] Supervisor: update Hass.io to 163 --- buildroot-external/configs/intel_nuc_defconfig | 2 +- buildroot-external/configs/odroid_c2_defconfig | 2 +- buildroot-external/configs/odroid_xu4_defconfig | 2 +- buildroot-external/configs/opi_prime_defconfig | 2 +- buildroot-external/configs/ova_defconfig | 2 +- buildroot-external/configs/rpi0_w_defconfig | 2 +- buildroot-external/configs/rpi2_defconfig | 2 +- buildroot-external/configs/rpi3_64_defconfig | 2 +- buildroot-external/configs/rpi3_defconfig | 2 +- buildroot-external/configs/rpi_defconfig | 2 +- buildroot-external/configs/tinker_defconfig | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 2cd16381f..cc9b0fb64 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -95,7 +95,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 856d496db..9696335be 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -88,7 +88,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 0effc3ecb..19a10cd15 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -96,7 +96,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/opi_prime_defconfig b/buildroot-external/configs/opi_prime_defconfig index 1454b5892..163d5f240 100644 --- a/buildroot-external/configs/opi_prime_defconfig +++ b/buildroot-external/configs/opi_prime_defconfig @@ -103,7 +103,7 @@ BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HOST_SWIG=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/orangepi-prime-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 2bf6e2bf6..8a4f133b0 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -83,7 +83,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index e44611e68..22f9c85ad 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 2741a9e9f..ed921ba0c 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi2-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index da27d6531..b10b4add3 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 30868a08d..e967378c5 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -92,7 +92,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi3-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 87eba53b4..e55e50a8a 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -91,7 +91,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt" diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index c4b4f6818..cf35a3f07 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -95,7 +95,7 @@ BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_RAUC=y BR2_PACKAGE_HASSOS=y BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" -BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="144" +BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="163" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/tinker-homeassistant" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE="hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_PROFILE_URL="http://s3.amazonaws.com/hassio-version/apparmor.txt"