From 69941ea418957c6bd5f469131b6da93ee4af965a Mon Sep 17 00:00:00 2001 From: MichaIng Date: Wed, 1 Jan 2025 16:08:08 +0700 Subject: [PATCH] v9.10 (#7335) - DietPi-Software | Home Assistant: Worked around an issue where the installation failed on ARMv6 and RISC-V systems, due to an incompatibility between two dependencies. Many thanks to @jankkhvej for reporting this issue: https://github.com/MichaIng/DietPi/issues/7329 --- CHANGELOG.txt | 1 + dietpi/dietpi-software | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2e0960d91e..c00050d21c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -10,6 +10,7 @@ Bug fixes: - DietPi-Software | Fail2Ban: Resolved an issue where a fixed Dropbear filter could not be installed, because the directory did not exist yet. Many thanks to @augustresende for reporting this issue: https://github.com/MichaIng/DietPi/issues/7325 - DietPi-Software | Raspotify: Resolved an issue where the service failed to start, if Avahi-Daemon was not installed. librespot has it as new default DNS discovery backend, and official pre-compiled Raspotify binaries are not compiled with the old DNS-SD backend anymore. Avahi-Daemon is hence installed now by DietPi-Software as well. Many thanks to @gergokis for reporting this issue: https://github.com/MichaIng/DietPi/issues/7323 - DietPi-Software | Navidrome: Resolved an issue where the service failed to start, since the latest release archive does not ship with the needed permissions. Many thanks to @nclro for reporting this issue: https://github.com/MichaIng/DietPi/issues/7336 +- DietPi-Software | Home Assistant: Worked around an issue where the installation failed on ARMv6 and RISC-V systems, due to an incompatibility between two dependencies. Many thanks to @jankkhvej for reporting this issue: https://github.com/MichaIng/DietPi/issues/7329 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/ADDME diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index a271c24c4a..69d61240b4 100755 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -11440,6 +11440,13 @@ _EOF_ G_EXEC mkdir -p "$ha_home/.pip" G_EXEC eval "echo -e '[global]\nno-cache-dir=true' > '$ha_home/.pip/pip.conf'" + # ARMv6/RISC-V: Work around incompatible latest maturin version with currently declared orjson v3.10.12 dependency: https://github.com/MichaIng/DietPi/issues/7329 + if (( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 )) + then + G_EXEC eval "echo 'constraint=$ha_home/.pip/constraints.txt' >> '$ha_home/.pip/pip.conf'" + G_EXEC eval "echo 'maturin==1.7.8' > '$ha_home/.pip/constraints.txt'" + fi + # Generate script to activate pyenv: This must be sourced from the originating shell, hence it does not require execute permissions. echo "#!/bin/dash if [ \$(whoami) != '$ha_user' ]; then