Merge pull request #10982 from sjackman/build-info-oldest-cpu
build_info: Add oldest_cpu_family
This commit is contained in:
commit
d5b972476e
@ -21,7 +21,10 @@ class DevelopmentTools
|
|||||||
end
|
end
|
||||||
|
|
||||||
def build_system_info
|
def build_system_info
|
||||||
generic_build_system_info.merge "glibc_version" => OS::Linux::Glibc.version
|
generic_build_system_info.merge({
|
||||||
|
"glibc_version" => OS::Linux::Glibc.version,
|
||||||
|
"oldest_cpu_family" => Hardware.oldest_cpu,
|
||||||
|
})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -246,11 +246,14 @@ class GitHubPackages
|
|||||||
(tab["built_on"]["glibc_version"] if tab["built_on"].present?) || "2.23"
|
(tab["built_on"]["glibc_version"] if tab["built_on"].present?) || "2.23"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
variant = tab["oldest_cpu_family"] || "core2" if os == "linux"
|
||||||
|
|
||||||
platform_hash = {
|
platform_hash = {
|
||||||
architecture: architecture,
|
architecture: architecture,
|
||||||
|
variant: variant,
|
||||||
os: os,
|
os: os,
|
||||||
"os.version" => os_version,
|
"os.version" => os_version,
|
||||||
}
|
}.compact
|
||||||
tar_sha256 = Digest::SHA256.hexdigest(
|
tar_sha256 = Digest::SHA256.hexdigest(
|
||||||
Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file),
|
Utils.safe_popen_read("gunzip", "--stdout", "--decompress", local_file),
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user