Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use exact architecture matching binaries where appropriate

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-06-09 15:53:02 +02:00
parent 9c27e4766d
commit 1c4e58efe3
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
automated install/basic-install.sh
View file

@ -1843,7 +1843,7 @@ get_binary_name() {
l_binary="pihole-FTL-armv6" l_binary="pihole-FTL-armv6"
else else
# If ARMv8 or higher is found (e.g., BCM2837 as found in Raspberry Pi Model 3B) # If ARMv8 or higher is found (e.g., BCM2837 as found in Raspberry Pi Model 3B)
if [[ "${rev}" -gt 7 ]]; then if [[ "${cpu_arch}" == "v7" || "${rev}" -gt 7 ]]; then
printf "%b %b Detected ARMv8 (or newer) architecture\\n" "${OVER}" "${TICK}" printf "%b %b Detected ARMv8 (or newer) architecture\\n" "${OVER}" "${TICK}"
# set the binary to be used # set the binary to be used
l_binary="pihole-FTL-armv7" l_binary="pihole-FTL-armv7"
@ -1852,7 +1852,7 @@ get_binary_name() {
printf "%b %b Detected ARMv7 architecture\\n" "${OVER}" "${TICK}" printf "%b %b Detected ARMv7 architecture\\n" "${OVER}" "${TICK}"
# set the binary to be used # set the binary to be used
l_binary="pihole-FTL-armv6" l_binary="pihole-FTL-armv6"
elif [[ "${rev}" -gt 5 ]]; then elif [[ "${cpu_arch}" == "v5TE" || "${rev}" -gt 5 ]]; then
# Check if the system is using GLIBC 2.29 or higher # Check if the system is using GLIBC 2.29 or higher
if [[ -n "${l_glibc_version}" && "$(printf '%s\n' "2.29" "${l_glibc_version}" | sort -V | head -n1)" == "2.29" ]]; then if [[ -n "${l_glibc_version}" && "$(printf '%s\n' "2.29" "${l_glibc_version}" | sort -V | head -n1)" == "2.29" ]]; then
# If so, use the ARMv6 binary (e.g., BCM2835 as found in Raspberry Pi Zero and Model 1) # If so, use the ARMv6 binary (e.g., BCM2835 as found in Raspberry Pi Zero and Model 1)