From a909d89e1ced742462d475e1cbd517a9960ae694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 7 Mar 2024 17:48:52 +0100 Subject: [PATCH 1/6] Bump OS to pre-release version 12.1.rc1 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index ab6c7fad7..1c0b7fbe5 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="12" VERSION_MINOR="1" -VERSION_SUFFIX="dev0" +VERSION_SUFFIX="rc1" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="development" +DEPLOYMENT="staging" From 3dfd3a4c21d39c8d5b908e10c0a6be2c7ff0accc Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 12 Mar 2024 10:12:35 +0100 Subject: [PATCH 2/6] Start HA CLI interactively and with a tty allocated (#3238) Use -i (--interactive) and -t (--tty) to start the HA CLI interactively. This is required by some commands like the new device wipe command added with https://github.com/home-assistant/cli/pull/464. (cherry picked from commit fe1978f98fab65f52676590e6c8e60716497d551) --- buildroot-external/rootfs-overlay/usr/bin/ha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/rootfs-overlay/usr/bin/ha b/buildroot-external/rootfs-overlay/usr/bin/ha index f4e49f932..351d59742 100755 --- a/buildroot-external/rootfs-overlay/usr/bin/ha +++ b/buildroot-external/rootfs-overlay/usr/bin/ha @@ -3,4 +3,4 @@ # HA utility # ============================================================================== -docker exec hassio_cli ha "$@" +docker exec -it hassio_cli ha "$@" From 32f1ca8fa8efe7d3308e59dfef9df3266d6902c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 12 Mar 2024 14:55:10 +0100 Subject: [PATCH 3/6] Fix test_restore_ssl_directory with HA CLI in interactive PTY (#3239) The test was missing --no-progress flag, which only manifested after merging #3238 - causing the CLI to run in an interactive pseudotty. (cherry picked from commit 122dd1c28875a599965c41678721635ef5028caa) --- tests/supervisor_test/test_supervisor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/supervisor_test/test_supervisor.py b/tests/supervisor_test/test_supervisor.py index 612f35970..c7621ea4f 100644 --- a/tests/supervisor_test/test_supervisor.py +++ b/tests/supervisor_test/test_supervisor.py @@ -187,6 +187,6 @@ def test_restore_backup(shell_json, stash): @pytest.mark.dependency(depends=["test_create_backup"]) def test_restore_ssl_directory(shell_json, stash): - result = shell_json(f"ha backups restore {stash.get('slug')} --folders ssl --raw-json") + result = shell_json(f"ha backups restore {stash.get('slug')} --folders ssl --no-progress --raw-json") assert result.get("result") == "ok", f"Backup restore failed: {result}" logger.info("Backup restore result: %s", result) From dd43bfee8ef291925aff10cc9fe803a27022fb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Tue, 12 Mar 2024 14:55:18 +0100 Subject: [PATCH 4/6] Fix IPv6 reachability patch not being applied (#3240) Fix regression caused by #3224 which introduced version-specific directory for linux patches, causing the upper-level patch not being applied. Copy the patch to the version folder instead. Also we need to keep it in the upper directory for RPi kernels. (cherry picked from commit 8226323a1b00ed3b96c9c10717de71f75aa5cd01) --- ...to-explicitly-enable-reachability-te.patch | 52 +++++++++++++++++++ ...hanges-causing-issues-with-Z-Wave.m.patch} | 0 2 files changed, 52 insertions(+) create mode 100644 buildroot-external/patches/linux/6.6.20/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch rename buildroot-external/patches/linux/6.6.20/{0001-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch => 0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch} (100%) diff --git a/buildroot-external/patches/linux/6.6.20/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch b/buildroot-external/patches/linux/6.6.20/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch new file mode 100644 index 000000000..2e82302b3 --- /dev/null +++ b/buildroot-external/patches/linux/6.6.20/0001-ipv6-add-option-to-explicitly-enable-reachability-te.patch @@ -0,0 +1,52 @@ +From 76591e4075194cf717dc085b8285912f706bcd46 Mon Sep 17 00:00:00 2001 +From: Stefan Agner +Date: Tue, 28 Mar 2023 12:02:10 +0200 +Subject: [PATCH] ipv6: add option to explicitly enable reachability test + +Systems which act as host as well as router might prefer the host +behavior. Currently the kernel does not allow to use IPv6 forwarding +globally and at the same time use route reachability probing. + +Add a compile time flag to enable route reachability probe in any +case. + +Signed-off-by: Stefan Agner +--- + net/ipv6/Kconfig | 9 +++++++++ + net/ipv6/route.c | 3 ++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig +index 08d4b7132d4c..242bf2eeb7ae 100644 +--- a/net/ipv6/Kconfig ++++ b/net/ipv6/Kconfig +@@ -48,6 +48,15 @@ config IPV6_OPTIMISTIC_DAD + + If unsure, say N. + ++config IPV6_REACHABILITY_PROBE ++ bool "IPv6: Always use reachability probing (RFC 4191)" ++ help ++ By default reachability probing is disabled on router devices (when ++ IPv6 forwarding is enabled). This option explicitly enables ++ reachability probing always. ++ ++ If unsure, say N. ++ + config INET6_AH + tristate "IPv6: AH transformation" + select XFRM_AH +diff --git a/net/ipv6/route.c b/net/ipv6/route.c +index 56525b5b95a2..916769b9a772 100644 +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -2211,7 +2211,8 @@ struct rt6_info *ip6_pol_route(struct net *net, struct fib6_table *table, + + strict |= flags & RT6_LOOKUP_F_IFACE; + strict |= flags & RT6_LOOKUP_F_IGNORE_LINKSTATE; +- if (net->ipv6.devconf_all->forwarding == 0) ++ if (net->ipv6.devconf_all->forwarding == 0 || ++ IS_ENABLED(CONFIG_IPV6_REACHABILITY_PROBE)) + strict |= RT6_LOOKUP_F_REACHABLE; + + rcu_read_lock(); diff --git a/buildroot-external/patches/linux/6.6.20/0001-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch b/buildroot-external/patches/linux/6.6.20/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch similarity index 100% rename from buildroot-external/patches/linux/6.6.20/0001-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch rename to buildroot-external/patches/linux/6.6.20/0002-Revert-USB-core-changes-causing-issues-with-Z-Wave.m.patch From 80dfffc0b060601a57640dd5aec8e969d3d14224 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 12 Mar 2024 16:04:54 +0100 Subject: [PATCH 5/6] Bump OS to pre-release version 12.1.rc2 --- buildroot-external/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index 1c0b7fbe5..bdb398b13 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,6 +1,6 @@ VERSION_MAJOR="12" VERSION_MINOR="1" -VERSION_SUFFIX="rc1" +VERSION_SUFFIX="rc2" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" From fde0c80e5435fb67f1dc5e4cfa7fb0b5f1325c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Wed, 13 Mar 2024 11:17:02 +0100 Subject: [PATCH 6/6] Bump OS to release version 12.1 --- buildroot-external/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot-external/meta b/buildroot-external/meta index bdb398b13..702ff9b41 100644 --- a/buildroot-external/meta +++ b/buildroot-external/meta @@ -1,8 +1,8 @@ VERSION_MAJOR="12" VERSION_MINOR="1" -VERSION_SUFFIX="rc2" +VERSION_SUFFIX="" HASSOS_NAME="Home Assistant OS" HASSOS_ID="haos" -DEPLOYMENT="staging" +DEPLOYMENT="production"