ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Install ARMv7 binary even when we detect a 64bit (aarch64) CPU but the operating system is 32bit. See FTL#2494 for reference
CodeQL / Analyze (pull_request) Has been cancelled
Details
Test Supported Distributions / smoke-tests (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled
Details
Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled
Details

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2025-06-06 06:44:17 +02:00
parent 4d4195ed4e
commit 082d74eeb1
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
automated install/basic-install.sh
+12 -3
View File
@@ -1849,9 +1849,18 @@ get_binary_name() {
# If the machine is aarch64 (armv8) # If the machine is aarch64 (armv8)
if [[ "${machine}" == "aarch64" ]]; then if [[ "${machine}" == "aarch64" ]]; then
# If AArch64 is found (e.g., BCM2711 in Raspberry Pi 4) if [[ "$(getconf LONG_BIT)" == "64" ]]; then
printf "%b %b Detected AArch64 (64 Bit ARM) architecture\\n" "${OVER}" "${TICK}" # If the OS is 64 bit, we use the arm64 binary
l_binary="pihole-FTL-arm64" printf "%b %b Detected AArch64 (64 Bit ARM) architecture\\n" "${OVER}" "${TICK}"
l_binary="pihole-FTL-arm64"
else
# If the OS is 32 bit, we use the armv7 binary (aarch64 is actually armv8)
# Even though the machine is 64 bit capable, this makes debugging
# very hard as 32bit tools like gdb, etc. cannot analyze the 64 bit
# binary. See FTL issue #2494 for such an example.
printf "%b %b Detected AArch64 (64 Bit ARM) architecture with 32 bit OS\\n" "${OVER}" "${TICK}"
l_binary="pihole-FTL-armv7"
fi
elif [[ "${machine}" == "arm"* ]]; then elif [[ "${machine}" == "arm"* ]]; then
# ARM 32 bit # ARM 32 bit
# Get supported processor from other binaries installed on the system # Get supported processor from other binaries installed on the system