github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4530 from tianon/rpi-armv6

Browse Source 
Add RPi1/RPi0 workaround
This commit is contained in:
Wei Fu 2020-09-06 11:49:13 +08:00 committed by GitHub
commit fabebe5d55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platforms/cpuinfo.go
View File

@ -96,6 +96,15 @@ func getCPUVariant() string {
return "" return ""
} }
// handle edge case for Raspberry Pi ARMv6 devices (which due to a kernel quirk, report "CPU architecture: 7")
// https://www.raspberrypi.org/forums/viewtopic.php?t=12614
if runtime.GOARCH == "arm" && variant == "7" {
model, err := getCPUInfo("model name")
if err == nil && strings.HasPrefix(strings.ToLower(model), "armv6-compatible") {
variant = "6"
}
}
switch strings.ToLower(variant) { switch strings.ToLower(variant) {
case "8", "aarch64": case "8", "aarch64":
// special case: if running a 32-bit userspace on aarch64, the variant should be "v7" // special case: if running a 32-bit userspace on aarch64, the variant should be "v7"