From 11827656a998f32c2594e8b8c710f78a5240fda4 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Tue, 18 Mar 2025 16:10:43 +0800 Subject: [PATCH 1/3] Fix bottle block generation and audit for arm64 Linux Before this change, `brew bottle` would add the `:arm64_linux` bottle lines last. This would make `brew style` complain because it wants the `arm64_*` bottles listed first. Let's fix this by retaining the existing style as closely as possible: - macOS bottles are listed first - for each OS, arm64 bottles are listed first (just as we do on macOS) In particular, `brew bottle` will now insert `:arm64_linux` bottle lines just above the `:x86_64_linux` bottle lines (but still below the macOS bottle lines). x86_64 may continue to be a more popular platform on Linux for quite some time. However, users looking for those bottles can continue to look in the same place as before this change (i.e., the last line of the bottle block). Taking this together with the consistency on macOS mentioned above, I think this is the right way forward here. For concreteness, here are some examples of bottle blocks before and after this change. Before this change, immediately after `brew bottle`: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" end Before this change, after doing `brew style --fix`: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" end After this change: bottle do sha256 arm64_sequoia: "1a57e04052f4bae4172d546a7927c645fc29d2ef5fafbec19d08ee1dddc542fb" sha256 arm64_sonoma: "a58cf9af5d04d3d5709b5337f3793586087a79e178da51d1f3978c0c13b8cf34" sha256 ventura: "6d8b90b2cbb31dcb78394c6540f5454cd57232fc309921173814f880e63718f0" sha256 arm64_linux: "457d3e9bd0c287483e27f29a488a18c90e1f55be076fc49b07942ef396c419be" sha256 x86_64_linux: "cd5faac2834ba79e39429b9aac99e4f69d6e6023cbb1cbcd0b62e94cfc69bb2a" end --- Library/Homebrew/bottle_specification.rb | 7 ++++--- Library/Homebrew/rubocops/bottle.rb | 25 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/bottle_specification.rb b/Library/Homebrew/bottle_specification.rb index 1984a3c64e..eab4311ac2 100644 --- a/Library/Homebrew/bottle_specification.rb +++ b/Library/Homebrew/bottle_specification.rb @@ -118,11 +118,12 @@ class BottleSpecification tags = collector.tags.sort_by do |tag| version = tag.to_macos_version # Give `arm64` bottles a higher priority so they are first. - priority = (tag.arch == :arm64) ? 2 : 1 + priority = (tag.arch == :arm64) ? 3 : 2 "#{priority}.#{version}_#{tag}" rescue MacOSVersion::Error - # Sort non-macOS tags below macOS tags. - "0.#{tag}" + # Sort non-macOS tags below macOS tags, and arm64 tags before other tags. + priority = (tag.arch == :arm64) ? 1 : 0 + "#{priority}.#{tag}" end tags.reverse.map do |tag| spec = collector.specification_for(tag) diff --git a/Library/Homebrew/rubocops/bottle.rb b/Library/Homebrew/rubocops/bottle.rb index e6de4adc11..866decd520 100644 --- a/Library/Homebrew/rubocops/bottle.rb +++ b/Library/Homebrew/rubocops/bottle.rb @@ -149,26 +149,35 @@ module RuboCop end end - arm64_nodes = [] - intel_nodes = [] + arm64_macos_nodes = [] + intel_macos_nodes = [] + arm64_linux_nodes = [] + intel_linux_nodes = [] sha256_nodes.each do |node| version = sha256_bottle_tag node - if version.to_s.start_with? "arm64" - arm64_nodes << node + if version == :arm64_linux + arm64_linux_nodes << node + elsif version.to_s.start_with?("arm64") + arm64_macos_nodes << node + elsif version.to_s.end_with?("_linux") + intel_linux_nodes << node else - intel_nodes << node + intel_macos_nodes << node end end - return if sha256_order(sha256_nodes) == sha256_order(arm64_nodes + intel_nodes) + sorted_nodes = arm64_macos_nodes + intel_macos_nodes + arm64_linux_nodes + intel_linux_nodes + return if sha256_order(sha256_nodes) == sha256_order(sorted_nodes) offending_node(bottle_node) problem "ARM bottles should be listed before Intel bottles" do |corrector| lines = ["bottle do"] lines += non_sha256_nodes.map { |node| " #{node.source}" } - lines += arm64_nodes.map { |node| " #{node.source}" } - lines += intel_nodes.map { |node| " #{node.source}" } + lines += arm64_macos_nodes.map { |node| " #{node.source}" } + lines += intel_macos_nodes.map { |node| " #{node.source}" } + lines += arm64_linux_nodes.map { |node| " #{node.source}" } + lines += intel_linux_nodes.map { |node| " #{node.source}" } lines << " end" corrector.replace(bottle_node.source_range, lines.join("\n")) end From 4510333e9a382bcbe52fc9e83de1dcf96e29d1b3 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Tue, 18 Mar 2025 16:56:44 +0800 Subject: [PATCH 2/3] Dockerfile: skip git-core PPA on arm64 Linux This seems to be broken on Ubuntu 22.04 at the moment. The system seems to ship a reasonably modern version (2.34.1), so I think we can make do with that for now. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 64ce1a2019..8286aa9625 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu # shellcheck disable=SC1091,SC2154,SC2292 RUN apt-get update \ && apt-get install -y --no-install-recommends software-properties-common gnupg-agent \ - && add-apt-repository -y ppa:git-core/ppa \ + && if [ "$(uname -m)" != aarch64 ]; then add-apt-repository -y ppa:git-core/ppa; fi \ && apt-get update \ && apt-get install -y --no-install-recommends \ acl \ From c180d636ef7f634220a204e37d0cf8da6f3e451d Mon Sep 17 00:00:00 2001 From: Adrian Ho Date: Tue, 18 Mar 2025 18:36:57 +0800 Subject: [PATCH 3/3] linux/hardware/cpu: fix amd_k12 reference AMD K12 was an planned ARM microarchitecture that never existed. Ref: https://en.wikipedia.org/wiki/List_of_AMD_CPU_microarchitectures#Nomenclature --- Library/Homebrew/extend/os/linux/hardware/cpu.rb | 2 +- Library/Homebrew/test/hardware/cpu_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/linux/hardware/cpu.rb b/Library/Homebrew/extend/os/linux/hardware/cpu.rb index c23a06e824..b5c81ee078 100644 --- a/Library/Homebrew/extend/os/linux/hardware/cpu.rb +++ b/Library/Homebrew/extend/os/linux/hardware/cpu.rb @@ -98,7 +98,7 @@ module Hardware when 0x11 :amd_k8_k10_hybrid when 0x12 - :amd_k12 + :amd_k10_llano when 0x14 :bobcat when 0x15 diff --git a/Library/Homebrew/test/hardware/cpu_spec.rb b/Library/Homebrew/test/hardware/cpu_spec.rb index 465d09ea53..6bf63294d2 100644 --- a/Library/Homebrew/test/hardware/cpu_spec.rb +++ b/Library/Homebrew/test/hardware/cpu_spec.rb @@ -26,7 +26,7 @@ RSpec.describe Hardware::CPU do :amd_k8, :amd_k8_k10_hybrid, :amd_k10, - :amd_k12, + :amd_k10_llano, :arm, :arm_blizzard_avalanche, :arm_brava,