Merge pull request 'Install ARMv7 binary even when we detect a 64bit (aarch64) CPU but the operating system is 32bit. See FTL#2494 for reference' (#5) from tweak/32bitARM into master
Reviewed-on: #5
This commit was merged in pull request #5.
This commit is contained in:
@@ -1963,9 +1963,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
|
||||||
|
# If the OS is 64 bit, we use the arm64 binary
|
||||||
printf "%b %b Detected AArch64 (64 Bit ARM) architecture\\n" "${OVER}" "${TICK}"
|
printf "%b %b Detected AArch64 (64 Bit ARM) architecture\\n" "${OVER}" "${TICK}"
|
||||||
l_binary="pihole-FTL-arm64"
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user