From c24e95b8d701b7a3a08d91d4666bcb9beb249758 Mon Sep 17 00:00:00 2001 From: Stephan Wendel <43513802+KwadFan@users.noreply.github.com> Date: Fri, 20 Oct 2023 17:06:16 +0200 Subject: [PATCH] fix: fix 'is_board_type' function (#243) Since we applied PR #241 and #242, this function always doesnt give the right value, which leads to unwanted behaviour in enabling SPI during build. As we no longer rename the release file, we have to use its original location in '/etc/armbian-release' ( Or '/etc/orangepi-release' if Opi Image is used ) Signed-off-by: Stephan Wendel --- src/modules/armbian/start_chroot_script | 2 +- src/modules/orangepi/start_chroot_script | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/armbian/start_chroot_script b/src/modules/armbian/start_chroot_script index 5ce9874b4..8a8235846 100644 --- a/src/modules/armbian/start_chroot_script +++ b/src/modules/armbian/start_chroot_script @@ -21,7 +21,7 @@ install_cleanup_trap is_board_type() { local board releasefile board="" - releasefile="/etc/armbian-release-info.txt" + releasefile="/etc/armbian-release" if [[ -f "${releasefile}" ]]; then board="$(grep "BOARD=" "${releasefile}" | cut -d'=' -f2)" fi diff --git a/src/modules/orangepi/start_chroot_script b/src/modules/orangepi/start_chroot_script index 32e18bf50..7e5d05544 100644 --- a/src/modules/orangepi/start_chroot_script +++ b/src/modules/orangepi/start_chroot_script @@ -28,7 +28,7 @@ install_cleanup_trap is_board_type() { local board releasefile board="" - releasefile="/etc/orangepi-release-info.txt" + releasefile="/etc/orangepi-release" if [[ -f "${releasefile}" ]]; then board="$(grep "BOARD=" "${releasefile}" | cut -d'=' -f2)" fi