From 66c1b016c968f15f637132c73ef0d5a9e0617c77 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 6 Feb 2020 18:57:20 +0100 Subject: [PATCH 1/6] Bump version to 4.3 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 37a924ab766..6f164da6622 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,5 +1,5 @@ VERSION_MAJOR=4 -VERSION_BUILD=2 +VERSION_BUILD=3 HASSOS_NAME="HassOS" HASSOS_ID="hassos" From a592fc986610fac9dbaec96f514ee616c1a44d17 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 10 Feb 2020 14:52:03 +0100 Subject: [PATCH 2/6] Change handling for SPL based images (#578) * Change handling for SPL based images * Fix script * Fix path for rauc-hook --- Documentation/development.md | 7 ++++++- buildroot-external/board/asus/tinker/meta | 3 ++- .../board/hardkernel/odroid-c2/meta | 1 + .../board/hardkernel/odroid-n2/meta | 1 + .../board/hardkernel/odroid-xu4/meta | 1 + buildroot-external/board/intel/nuc/meta | 1 + buildroot-external/board/intel/ova/meta | 1 + buildroot-external/board/raspberrypi/rpi/meta | 1 + .../board/raspberrypi/rpi0-w/meta | 1 + buildroot-external/board/raspberrypi/rpi2/meta | 1 + .../board/raspberrypi/rpi3-64/meta | 1 + buildroot-external/board/raspberrypi/rpi3/meta | 1 + .../board/raspberrypi/rpi4-64/meta | 1 + buildroot-external/board/raspberrypi/rpi4/meta | 1 + buildroot-external/{misc => ota}/dev-ca.pem | 0 .../{misc => ota}/provisioning-ca.pem | 0 buildroot-external/{misc => ota}/rauc-hook | 0 buildroot-external/{misc => ota}/rel-ca.pem | 0 buildroot-external/scripts/hdd-image.sh | 17 +++++++++++------ buildroot-external/scripts/ota.sh | 4 ++-- buildroot-external/scripts/rauc.sh | 8 ++++---- 21 files changed, 37 insertions(+), 14 deletions(-) rename buildroot-external/{misc => ota}/dev-ca.pem (100%) rename buildroot-external/{misc => ota}/provisioning-ca.pem (100%) rename buildroot-external/{misc => ota}/rauc-hook (100%) rename buildroot-external/{misc => ota}/rel-ca.pem (100%) diff --git a/Documentation/development.md b/Documentation/development.md index 6a165eef062..e790d42f4a0 100644 --- a/Documentation/development.md +++ b/Documentation/development.md @@ -5,7 +5,6 @@ `BOOT_SYS`: - efi - hyprid -- spl - mbr HassOS is basicly used GPT. But for use GPT we need own the first 1024 of @@ -13,6 +12,12 @@ boot drive. Is that not possible, you can use MBR for your device, they work als Hyprid and SPL use both a hyprid MBR/GPT table but SPL move the GPT header 8MB for give space to write SPL and boot images before. +`BOOT_SPL`: +- true +- false + +Enable SPL update handling. + `BOOTLOADER`: - uboot - barebox diff --git a/buildroot-external/board/asus/tinker/meta b/buildroot-external/board/asus/tinker/meta index 55c3992b7c2..1dd6137c81d 100644 --- a/buildroot-external/board/asus/tinker/meta +++ b/buildroot-external/board/asus/tinker/meta @@ -3,5 +3,6 @@ BOARD_NAME="Asus TinkerBoard" CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage -BOOT_SYS=spl +BOOT_SYS=hyprid +BOOT_SPL=true BOOT_ENV_SIZE=0x8000 diff --git a/buildroot-external/board/hardkernel/odroid-c2/meta b/buildroot-external/board/hardkernel/odroid-c2/meta index ccb76c12bed..2648f6f2cfa 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/meta +++ b/buildroot-external/board/hardkernel/odroid-c2/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=Image BOOT_SYS=mbr +BOOT_SPL=true BOOT_ENV_SIZE=0x2000 diff --git a/buildroot-external/board/hardkernel/odroid-n2/meta b/buildroot-external/board/hardkernel/odroid-n2/meta index fcf5c544b41..92b657865f8 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/meta +++ b/buildroot-external/board/hardkernel/odroid-n2/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=Image BOOT_SYS=mbr +BOOT_SPL=true BOOT_ENV_SIZE=0x2000 diff --git a/buildroot-external/board/hardkernel/odroid-xu4/meta b/buildroot-external/board/hardkernel/odroid-xu4/meta index 41110e03d7a..18471a3ac1f 100644 --- a/buildroot-external/board/hardkernel/odroid-xu4/meta +++ b/buildroot-external/board/hardkernel/odroid-xu4/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=mbr +BOOT_SPL=true BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/intel/nuc/meta b/buildroot-external/board/intel/nuc/meta index 25be9438b62..a1aa8d2d476 100644 --- a/buildroot-external/board/intel/nuc/meta +++ b/buildroot-external/board/intel/nuc/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=barebox KERNEL_FILE=bzImage BOOT_SYS=efi +BOOT_SPL=false DISK_SIZE=6 diff --git a/buildroot-external/board/intel/ova/meta b/buildroot-external/board/intel/ova/meta index a056054894a..68a2e1baf6f 100644 --- a/buildroot-external/board/intel/ova/meta +++ b/buildroot-external/board/intel/ova/meta @@ -4,4 +4,5 @@ CHASSIS=vm BOOTLOADER=barebox KERNEL_FILE=bzImage BOOT_SYS=efi +BOOT_SPL=false DISK_SIZE=6 diff --git a/buildroot-external/board/raspberrypi/rpi/meta b/buildroot-external/board/raspberrypi/rpi/meta index 4e0cc9368dd..334bfb441ae 100644 --- a/buildroot-external/board/raspberrypi/rpi/meta +++ b/buildroot-external/board/raspberrypi/rpi/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi0-w/meta b/buildroot-external/board/raspberrypi/rpi0-w/meta index 056946a6d1d..bf63c857cd2 100644 --- a/buildroot-external/board/raspberrypi/rpi0-w/meta +++ b/buildroot-external/board/raspberrypi/rpi0-w/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi2/meta b/buildroot-external/board/raspberrypi/rpi2/meta index d24ec65c440..a33993f0a75 100644 --- a/buildroot-external/board/raspberrypi/rpi2/meta +++ b/buildroot-external/board/raspberrypi/rpi2/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi3-64/meta b/buildroot-external/board/raspberrypi/rpi3-64/meta index b6dd5c2e4a3..9f0a0890eed 100644 --- a/buildroot-external/board/raspberrypi/rpi3-64/meta +++ b/buildroot-external/board/raspberrypi/rpi3-64/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=Image BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi3/meta b/buildroot-external/board/raspberrypi/rpi3/meta index 0f8810ab519..b499559633b 100644 --- a/buildroot-external/board/raspberrypi/rpi3/meta +++ b/buildroot-external/board/raspberrypi/rpi3/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi4-64/meta b/buildroot-external/board/raspberrypi/rpi4-64/meta index 6de3cd3f6b4..6a5b92cf79a 100644 --- a/buildroot-external/board/raspberrypi/rpi4-64/meta +++ b/buildroot-external/board/raspberrypi/rpi4-64/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=Image BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/board/raspberrypi/rpi4/meta b/buildroot-external/board/raspberrypi/rpi4/meta index de2f5597629..bdd2dc3b352 100644 --- a/buildroot-external/board/raspberrypi/rpi4/meta +++ b/buildroot-external/board/raspberrypi/rpi4/meta @@ -4,4 +4,5 @@ CHASSIS=embedded BOOTLOADER=uboot KERNEL_FILE=zImage BOOT_SYS=hyprid +BOOT_SPL=false BOOT_ENV_SIZE=0x4000 diff --git a/buildroot-external/misc/dev-ca.pem b/buildroot-external/ota/dev-ca.pem similarity index 100% rename from buildroot-external/misc/dev-ca.pem rename to buildroot-external/ota/dev-ca.pem diff --git a/buildroot-external/misc/provisioning-ca.pem b/buildroot-external/ota/provisioning-ca.pem similarity index 100% rename from buildroot-external/misc/provisioning-ca.pem rename to buildroot-external/ota/provisioning-ca.pem diff --git a/buildroot-external/misc/rauc-hook b/buildroot-external/ota/rauc-hook similarity index 100% rename from buildroot-external/misc/rauc-hook rename to buildroot-external/ota/rauc-hook diff --git a/buildroot-external/misc/rel-ca.pem b/buildroot-external/ota/rel-ca.pem similarity index 100% rename from buildroot-external/misc/rel-ca.pem rename to buildroot-external/ota/rel-ca.pem diff --git a/buildroot-external/scripts/hdd-image.sh b/buildroot-external/scripts/hdd-image.sh index aebd4a70cfb..1b9887c0aeb 100755 --- a/buildroot-external/scripts/hdd-image.sh +++ b/buildroot-external/scripts/hdd-image.sh @@ -45,7 +45,7 @@ function size2sectors() { function get_boot_size() { - if [ "${BOOT_SYS}" == "spl" ]; then + if [ "${BOOT_SPL}" == "true" ]; then echo "${BOOT_SIZE[1]}" else echo "${BOOT_SIZE[0]}" @@ -138,7 +138,7 @@ function _create_disk_gpt() { # Partition layout # SPL - if [ "${BOOT_SYS}" == "spl" ]; then + if [ "${BOOT_SPL}" == "true" ]; then sgdisk -j 16384 "${hdd_img}" fi @@ -180,10 +180,13 @@ function _create_disk_gpt() { dd if="${overlay_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${overlay_offset}" dd if="${data_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${data_offset}" - # Fix boot + # Set Hyprid partition if [ "${BOOT_SYS}" == "hyprid" ]; then _fix_disk_hyprid - elif [ "${BOOT_SYS}" == "spl" ]; then + fi + + # Write SPL + if [ "${BOOT_SPL}" == "true" ]; then _fix_disk_spl_gpt fi } @@ -255,8 +258,10 @@ function _create_disk_mbr() { dd if="${overlay_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${overlay_offset}" dd if="${data_img}" of="${hdd_img}" conv=notrunc bs=512 seek="${data_offset}" - # Wripte SPL - _fix_disk_spl_mbr + # Write SPL + if [ "${BOOT_SPL}" == "true" ]; then + _fix_disk_spl_mbr + fi } diff --git a/buildroot-external/scripts/ota.sh b/buildroot-external/scripts/ota.sh index 4f6c101c7bb..f53cfe6322e 100755 --- a/buildroot-external/scripts/ota.sh +++ b/buildroot-external/scripts/ota.sh @@ -23,7 +23,7 @@ function create_ota_update() { cp -f "${kernel}" "${rauc_folder}/kernel.ext4" cp -f "${boot}" "${rauc_folder}/boot.vfat" cp -f "${rootfs}" "${rauc_folder}/rootfs.img" - cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/rauc-hook" "${rauc_folder}/hook" + cp -f "${BR2_EXTERNAL_HASSOS_PATH}/ota/rauc-hook" "${rauc_folder}/hook" ( echo "[update]" @@ -41,7 +41,7 @@ function create_ota_update() { ) > "${rauc_folder}/manifest.raucm" # SPL - if [ "${BOOT_SYS}" == "spl" ]; then + if [ "${BOOT_SPL}" == "true" ]; then cp -f "${spl}" "${rauc_folder}/spl.img" ( diff --git a/buildroot-external/scripts/rauc.sh b/buildroot-external/scripts/rauc.sh index b06748b6503..197dbfede48 100755 --- a/buildroot-external/scripts/rauc.sh +++ b/buildroot-external/scripts/rauc.sh @@ -27,7 +27,7 @@ function _write_rauc_boot() { ) >> "${TARGET_DIR}/etc/rauc/system.conf" # SPL - if ! [[ "${BOOT_SYS}" =~ (spl|mbr) ]]; then + if ! [ "${BOOT_SPL}" == "true" ]; then return 0 fi @@ -69,9 +69,9 @@ function write_rauc_config() { function install_rauc_certs() { if [ "${DEPLOYMENT}" == "production" ]; then - cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/rel-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem" + cp "${BR2_EXTERNAL_HASSOS_PATH}/ota/rel-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem" else - cp "${BR2_EXTERNAL_HASSOS_PATH}/misc/dev-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem" + cp "${BR2_EXTERNAL_HASSOS_PATH}/ota/dev-ca.pem" "${TARGET_DIR}/etc/rauc/keyring.pem" fi } @@ -87,6 +87,6 @@ function install_bootloader_config() { # Fix MBR if [ "${BOOT_SYS}" == "mbr" ]; then mkdir -p "${TARGET_DIR}/usr/lib/udev/rules.d" - cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-part.rules" "${TARGET_DIR}/usr/lib/udev/rules.d/" + cp -f "${BR2_EXTERNAL_HASSOS_PATH}/misc/mbr-part.rules" "${TARGET_DIR}/usr/lib/udev/rules.d/" fi } From a65db13c9e7010955b14cdbe7b7d029c73092bf5 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 16 Feb 2020 11:46:25 +0100 Subject: [PATCH 3/6] Support better armv7 emulation N2/C2 (#584) * Support better armv7 emulation N2/C2 * Update kernel.config --- buildroot-external/board/hardkernel/odroid-c2/kernel.config | 5 ++++- buildroot-external/board/hardkernel/odroid-n2/kernel.config | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/buildroot-external/board/hardkernel/odroid-c2/kernel.config b/buildroot-external/board/hardkernel/odroid-c2/kernel.config index 25a14331506..847771a4f0e 100644 --- a/buildroot-external/board/hardkernel/odroid-c2/kernel.config +++ b/buildroot-external/board/hardkernel/odroid-c2/kernel.config @@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y -# CONFIG_ARMV8_DEPRECATED is not set +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_SETEND_EMULATION=y # # ARMv8.1 architectural features diff --git a/buildroot-external/board/hardkernel/odroid-n2/kernel.config b/buildroot-external/board/hardkernel/odroid-n2/kernel.config index bfe010f181a..9203ba383e4 100644 --- a/buildroot-external/board/hardkernel/odroid-n2/kernel.config +++ b/buildroot-external/board/hardkernel/odroid-n2/kernel.config @@ -382,7 +382,10 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y CONFIG_ARM64_TAGGED_ADDR_ABI=y CONFIG_COMPAT=y CONFIG_KUSER_HELPERS=y -# CONFIG_ARMV8_DEPRECATED is not set +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_SETEND_EMULATION=y # # ARMv8.1 architectural features From 279a4c4db15adb3156770d737aaa5bafd4741cbb Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 16 Feb 2020 11:46:41 +0100 Subject: [PATCH 4/6] Change uptime for offline update (#585) --- buildroot-external/rootfs-overlay/usr/sbin/hassos-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config index 08504c53b37..0cf8abd4af4 100755 --- a/buildroot-external/rootfs-overlay/usr/sbin/hassos-config +++ b/buildroot-external/rootfs-overlay/usr/sbin/hassos-config @@ -96,7 +96,7 @@ fi ## # Firmware update / Only USB UPTIME=$(awk '{printf "%0.f", $1}' /proc/uptime) -if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ "${UPTIME}" -ge "180" ]; then +if ls ${USB_CONFIG}/*.raucb > /dev/null 2>&1 && [ "${UPTIME}" -ge "300" ]; then echo "[Info] Performe a firmware update" # shellcheck disable=SC2012 From 2d6f692a4cc32c603f53b98fd73768fac0a0359b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 17 Feb 2020 09:53:09 +0100 Subject: [PATCH 5/6] Rename Hass.io (#587) --- .github/ISSUE_TEMPLATE.md | 2 +- Documentation/configuration.md | 4 ++-- Documentation/getting_started_development.md | 2 +- Documentation/network.md | 6 +++--- buildroot-external/busybox.config | 2 +- buildroot-external/configs/intel_nuc_defconfig | 8 ++++---- buildroot-external/configs/odroid_c2_defconfig | 8 ++++---- buildroot-external/configs/odroid_n2_defconfig | 8 ++++---- buildroot-external/configs/odroid_xu4_defconfig | 8 ++++---- buildroot-external/configs/ova_defconfig | 8 ++++---- buildroot-external/configs/rpi0_w_defconfig | 8 ++++---- buildroot-external/configs/rpi2_defconfig | 8 ++++---- buildroot-external/configs/rpi3_64_defconfig | 8 ++++---- buildroot-external/configs/rpi3_defconfig | 8 ++++---- buildroot-external/configs/rpi4_64_defconfig | 8 ++++---- buildroot-external/configs/rpi4_defconfig | 8 ++++---- buildroot-external/configs/rpi_defconfig | 8 ++++---- buildroot-external/configs/tinker_defconfig | 8 ++++---- 18 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 873a767483e..fd7ed2e5ef7 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -16,7 +16,7 @@ **Supervisor logs:** **Journal logs:** diff --git a/Documentation/configuration.md b/Documentation/configuration.md index 06609b78569..7bc1892cc62 100644 --- a/Documentation/configuration.md +++ b/Documentation/configuration.md @@ -19,7 +19,7 @@ hassos-xy.raucb - 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 `authorized_keys` file activates debug SSH access on port `22222`. See [Debugging Home Assistant][debug-homeassistant]. - 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. @@ -57,4 +57,4 @@ FallbackNTP=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org [systemd-modules]: https://www.freedesktop.org/software/systemd/man/modules-load.d.html [network.md]: network.md [hassos-release]: https://github.com/home-assistant/hassos/releases/ -[debug-hassio]: https://developers.home-assistant.io/docs/en/hassio_debugging.html +[debug-homeassistant]: https://developers.home-assistant.io/docs/en/hassio_debugging.html diff --git a/Documentation/getting_started_development.md b/Documentation/getting_started_development.md index f7407bab6c2..62fa45de33f 100644 --- a/Documentation/getting_started_development.md +++ b/Documentation/getting_started_development.md @@ -101,6 +101,6 @@ $ /usr/bin/qemu-system-x86_64 -enable-kvm -name hassos_ova -smp 2 -m 1024 -drive This should pop up qemu's SDL frontend, displaying _hassos_' VT/CLI environment. Specifying addtional options and flags to qemu for network access, keyboard layout et al. are left as an exercise for the reader. -After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *hassio>* shell prompt will yield a root shell in the host OS. +After the boot process has finished, you can log in to _hassos_ without a password, providing *root* as the username. From there, executing `login` on the *ha>* shell prompt will yield a root shell in the host OS. Happy hacking! :) diff --git a/Documentation/network.md b/Documentation/network.md index 09f3d3b9545..f13686d461a 100644 --- a/Documentation/network.md +++ b/Documentation/network.md @@ -106,12 +106,12 @@ powersave=0 Log into the HASSOS base system via a console: ``` -Welcome to HassOS -Hassio login: +Welcome to Home Assistant +homeassistant login: ``` Login as `root` (no password needed) -At the `hassio >` prompt, type `login` (as instructed). +At the `ha >` prompt, type `login` (as instructed). From here you will use the `nmcli` configuration tool. diff --git a/buildroot-external/busybox.config b/buildroot-external/busybox.config index f29ab87e696..a798ddcc311 100644 --- a/buildroot-external/busybox.config +++ b/buildroot-external/busybox.config @@ -320,7 +320,7 @@ CONFIG_TRUE=y CONFIG_TRUNCATE=y CONFIG_TTY=y CONFIG_UNAME=y -CONFIG_UNAME_OSNAME="Hassio/OS" +CONFIG_UNAME_OSNAME="HassOS" CONFIG_UNIQ=y CONFIG_UNLINK=y CONFIG_USLEEP=y diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 8a4e559a853..ad1a383f6c4 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/buildroot-external/configs/intel_nuc_defconfig @@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -99,10 +99,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 543eab83e0c..8bbaa9effc7 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -93,10 +93,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index f1185432398..c29e31e369b 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -93,10 +93,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 10024f1b1b1..d48fc9e6779 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -9,8 +9,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -98,10 +98,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" BR2_PACKAGE_HASSOS_CLI_VERSION="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index e6010ecb723..0f5ace8ce00 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/buildroot-external/configs/ova_defconfig @@ -8,8 +8,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -89,10 +89,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/amd64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 80f880c2599..a6093a10193 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 76fc856faa0..51ff52427b4 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -95,10 +95,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" BR2_PACKAGE_HASSOS_CLI_VERSION="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 8431f60e293..09909bf2325 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index acc30f5f8d2..337a9bb49b5 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -96,10 +96,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" BR2_PACKAGE_HASSOS_CLI_VERSION="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 5b25561f4cc..2d66911dc0d 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -97,10 +97,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/aarch64-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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="http://s3.amazonaws.com/hassio-version/apparmor.txt" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index ff86a93a5b1..916a2c7dde3 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -97,10 +97,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" BR2_PACKAGE_HASSOS_SUPERVISOR_ARGS="-e HOMEASSISTANT_REPOSITORY=homeassistant/raspberrypi4-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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" BR2_PACKAGE_HASSOS_CLI_VERSION="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index f4d5c29fdfc..323e2363e36 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -95,10 +95,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armhf-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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" +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="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index da2863029f4..f1d69c48c1d 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -10,8 +10,8 @@ BR2_GCC_VERSION_7_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_BINUTILS_ENABLE_LTO=y BR2_GCC_ENABLE_LTO=y -BR2_TARGET_GENERIC_HOSTNAME="hassio" -BR2_TARGET_GENERIC_ISSUE="Welcome to HassOS" +BR2_TARGET_GENERIC_HOSTNAME="homeassistant" +BR2_TARGET_GENERIC_ISSUE="Welcome to Home Assistant" BR2_INIT_SYSTEMD=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set @@ -100,10 +100,10 @@ BR2_PACKAGE_HASSOS_SUPERVISOR="homeassistant/armv7-hassio-supervisor" BR2_PACKAGE_HASSOS_SUPERVISOR_VERSION="199" 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_SUPERVISOR_PROFILE_URL="https://version.home-assistant.io/apparmor.txt" BR2_PACKAGE_HASSOS_CLI="homeassistant/armv7-hassio-cli" BR2_PACKAGE_HASSOS_CLI_VERSION="16" -BR2_PACKAGE_HASSOS_CLI_ARGS="--network=hassio --add-host hassio:172.30.32.2" +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 From 7d7a52732d8527024ef415f5b261fb6128645d3e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 17 Feb 2020 13:25:44 +0100 Subject: [PATCH 6/6] Fix supervisor name on cli config (#588) --- buildroot-external/ota/rauc-hook | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildroot-external/ota/rauc-hook b/buildroot-external/ota/rauc-hook index de24bf49961..73b2e0e3a37 100755 --- a/buildroot-external/ota/rauc-hook +++ b/buildroot-external/ota/rauc-hook @@ -31,5 +31,8 @@ fi ## # Fixups +# Rename CLI Hass.io +sed -i "s/hassio:172.30.32.2/supervisor:172.30.32.2/g" /mnt/data/hassos.json + exit 0