From 7c23b7aa4a4e088c54f5e97a93b0e97c6c77b9e2 Mon Sep 17 00:00:00 2001 From: NeimadTL Date: Mon, 17 Mar 2025 19:29:39 -0400 Subject: [PATCH 1/9] Add possible curl issues This new part of documentation has been added in order to provide users a way to identify curl related issues which may or may not be caused by their workstation. --- docs/Common-Issues.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md index 8871db6c5b..7175c50402 100644 --- a/docs/Common-Issues.md +++ b/docs/Common-Issues.md @@ -259,3 +259,10 @@ Help us by [submitting a fix](https://github.com/Homebrew/homebrew-cask/blob/HEA ## Other local issues If your Homebrew installation gets messed up (and fixing the issues found by `brew doctor` doesn't solve the problem), reinstalling Homebrew may help to reset to a normal state. To easily reinstall Homebrew, use [Homebrew Bundle](https://github.com/Homebrew/homebrew-bundle) to automatically restore your installed formulae and casks. To do so, run `brew bundle dump`, [uninstall](https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew), [reinstall](https://docs.brew.sh/Installation) and run `brew bundle install`. + +## Possible curl issues + +Sometimes, the user's workstation itself may be responsible for issues which therefore are outside Homebrew's control. As brew is making extensive use of `curl`, good configuration as well as good connectivity are required in order to allow brew to function correctly. Here some links that could help you identify cURL issues based on `curl`'s and `libcurl`'s exit codes: + + - https://everything.curl.dev/cmdline/exitcode.html + - https://curl.se/libcurl/c/libcurl-errors.html From 11827656a998f32c2594e8b8c710f78a5240fda4 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Tue, 18 Mar 2025 16:10:43 +0800 Subject: [PATCH 2/9] 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 e81794c96a8f2ddad263b9a678f971748cb1a14e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 18 Mar 2025 08:41:25 +0000 Subject: [PATCH 3/9] docs/Common-Issues: tweak wording. --- docs/Common-Issues.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md index 7175c50402..1a7bf83b2c 100644 --- a/docs/Common-Issues.md +++ b/docs/Common-Issues.md @@ -260,9 +260,9 @@ Help us by [submitting a fix](https://github.com/Homebrew/homebrew-cask/blob/HEA If your Homebrew installation gets messed up (and fixing the issues found by `brew doctor` doesn't solve the problem), reinstalling Homebrew may help to reset to a normal state. To easily reinstall Homebrew, use [Homebrew Bundle](https://github.com/Homebrew/homebrew-bundle) to automatically restore your installed formulae and casks. To do so, run `brew bundle dump`, [uninstall](https://docs.brew.sh/FAQ#how-do-i-uninstall-homebrew), [reinstall](https://docs.brew.sh/Installation) and run `brew bundle install`. -## Possible curl issues +## Possible `curl` issues -Sometimes, the user's workstation itself may be responsible for issues which therefore are outside Homebrew's control. As brew is making extensive use of `curl`, good configuration as well as good connectivity are required in order to allow brew to function correctly. Here some links that could help you identify cURL issues based on `curl`'s and `libcurl`'s exit codes: +Sometimes, the user's computer, configuration or network connection may cause issues downloading with `curl` which are outside Homebrew's control. Homebrew requires good internet connectivity and correct configuration to function correctly. Here some links that could help you identify cURL issues based on `curl`'s and `libcurl`'s exit codes: - https://everything.curl.dev/cmdline/exitcode.html - https://curl.se/libcurl/c/libcurl-errors.html From 689fb13299817e2a13a9200ff8e8944bf86ae6b6 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 18 Mar 2025 08:43:51 +0000 Subject: [PATCH 4/9] docs/Common-Issues: fix style. --- docs/Common-Issues.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Common-Issues.md b/docs/Common-Issues.md index 1a7bf83b2c..261a9c2b6c 100644 --- a/docs/Common-Issues.md +++ b/docs/Common-Issues.md @@ -264,5 +264,5 @@ If your Homebrew installation gets messed up (and fixing the issues found by `br Sometimes, the user's computer, configuration or network connection may cause issues downloading with `curl` which are outside Homebrew's control. Homebrew requires good internet connectivity and correct configuration to function correctly. Here some links that could help you identify cURL issues based on `curl`'s and `libcurl`'s exit codes: - - https://everything.curl.dev/cmdline/exitcode.html - - https://curl.se/libcurl/c/libcurl-errors.html +* https://everything.curl.dev/cmdline/exitcode.html +* https://curl.se/libcurl/c/libcurl-errors.html From 4510333e9a382bcbe52fc9e83de1dcf96e29d1b3 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera Date: Tue, 18 Mar 2025 16:56:44 +0800 Subject: [PATCH 5/9] 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 4b62b9d2c5edc661ebd9859e349217cd8c3a4164 Mon Sep 17 00:00:00 2001 From: botantony Date: Mon, 17 Mar 2025 15:44:16 +0100 Subject: [PATCH 6/9] fix: ignore broken kegs during gcc linkage test Signed-off-by: botantony Co-authored-by: Carlo Cabrera --- Library/Homebrew/extend/os/linux/diagnostic.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/os/linux/diagnostic.rb b/Library/Homebrew/extend/os/linux/diagnostic.rb index 2aad96cc0c..b3d0e5a510 100644 --- a/Library/Homebrew/extend/os/linux/diagnostic.rb +++ b/Library/Homebrew/extend/os/linux/diagnostic.rb @@ -143,7 +143,14 @@ module OS return if gcc_dependents.empty? badly_linked = gcc_dependents.select do |dependent| - keg = Keg.new(dependent.prefix) + dependent_prefix = dependent.any_installed_prefix + # Keg.new() may raise an error if it is not a directory. + # As the result `brew doctor` may display `Error: is not a directory` + # instead of proper `doctor` information. + # There are other checks that test that, we can skip broken kegs. + next if dependent_prefix.nil? || !dependent_prefix.exist? || !dependent_prefix.directory? + + keg = Keg.new(dependent_prefix) keg.binary_executable_or_library_files.any? do |binary| paths = binary.rpaths versioned_linkage = paths.any? { |path| path.match?(%r{lib/gcc/\d+$}) } From c180d636ef7f634220a204e37d0cf8da6f3e451d Mon Sep 17 00:00:00 2001 From: Adrian Ho Date: Tue, 18 Mar 2025 18:36:57 +0800 Subject: [PATCH 7/9] 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, From d3cfc3d1935ada4d4bb017c3d49d3c05d6ce584b Mon Sep 17 00:00:00 2001 From: botantony Date: Tue, 18 Mar 2025 11:49:45 +0100 Subject: [PATCH 8/9] unpack `.dmg`: ignore `.HFS+ Private*` metadata directories Signed-off-by: botantony --- .../test/support/fixtures/test.dmg.gz | Bin 3748 -> 5687 bytes Library/Homebrew/unpack_strategy/dmg.rb | 26 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/test/support/fixtures/test.dmg.gz b/Library/Homebrew/test/support/fixtures/test.dmg.gz index 887cb330d1335e6c8adb0a0e9fba69de228b094d..9d000cfb14780a3b3a6556b5e45abc217132a2f4 100644 GIT binary patch literal 5687 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 Vix9_UI)4JKS6`;MAQ0;i{{etzVv_&> literal 3748 zcmeH}X;9Ni8pflju!3Oes8LM9>Zmx#HOS!v$rPwF3`9Hzf#FgP5s@>5LkWSI1x7hs zZjmFy4w6|A!X@F33kF0&IHH7rNq_)>1PCFJ5b{s{8>eckwq`%>e%UJCZ{7X$^FICS z>Z(ShYiZp#81;o{LFk7%Xe$M_%Q2^@oA@*sT`(N@^2FZ|YWAjToMSF;t;t_dTz%l>#)RvT8(!O4^ zkxLpHk0VDG5;#l_ql?p2FgnVNA-LFxIxwPES)#Axo=8@vplc^zU!tUR7gfyW5L4Qc z!xNd)#bIG#UiEQ-PFk&XRvuC7+LmY1L!yG8wlIxGrH`9%bLAfT-0`)gns%wlvv@Yo z#k*PD*$nNBq$V;2{X_~6gt1E%S{m2Pyj4R&F?TJtVZ znH9wG*6*$yJ`C5%bW}#TBj8#!J#ZxCKPtn@sE{46RI$h_nUYRw{Ku$LMoS9v7U_or z0*5#hQ#kLfBsQN1r}PQ(rHr6Nc|OLeknM}CZNS7|ZtME$ti(aq5yfM)jfZ-*5!}Dv zJ$dsS>Jlh3PglGxY)USx%tt1fpC|-Q2zYMXr1KX$MN^sJZ^wSTxC8P!MKM1hJTfRB zPnO1I=?fqCpAC6%1hZDP{_tz@4`1sA!{HKns@)b9z;*xi(mr)`oj0hbF389T!8(ow z;Olr`WP)9-C@C{<0|3Ok=8>Q=)wq0~|)%DjgU-Z@uv zLv5%!zn7WS@t8qd z{85LjfhLm6Bw6o)jDInfnL-!mYh$Nt#D6Yve&^d8yTY##E5r6c%w`+-7Af|2-+z84 z-nGBz!>RJGGV~7Gqn|ghl=LOur{dNP46vFHi_r>NFul4l3o zg?o;{)Je@g>s8t$oUjFo3v5&f%24<(Ja8yK9zgYaXUD@>!h_x<5+RXa-O?$>LvDZm zwv74N0o+qCt**m4a_2R8uC}SDWwCQb3~t8uY@*bL88FnATxu;Fx)5uC3@dxTOue(@ zWKR0_;`t%`$04XXZ>9VoXE@hf-7+!Ku z(yGByOwWN{&SG41)ywOj%zZQlLG_mZ!@6zgn)mzLn)+L{QS5(nfQ-E|Zd}Yr8)1yh zEo;UE;~cfnb(x6Z!8ZmV(e-f zd7zvYLluMkoCd#tsi*e*dnl-Qj0XG?At+5?R5ii)a*`toL`=#nyw4f;zzoz%vwK`6 zwJZOdc|h9rj9ECZuq^k7zkVOmUzPhR#XgdrG@W%oEn66TK~3Ar!oyA(&C84R?F^6O zOu5l+6Il{~nMVT&CL$XjERt|kDW zkgNA*9L~=##Y!K+)Te^(&dCEXi;SgB{JF@Fs4?(iWYmCh`g0~Hx7kSowpG+FOvK;3 zG4`PqM5xWLWaU%SK#NNV3AozXZ=7CWN%AhWQVVD1*YN6fXe-?s#BWs-yk4ycxT3cl zJ)f6nQs@8$<9f5jDk1s?4K&qebgyK!>m1AJbIR=#tOmpx(wqeEK8_{woSstJ1unio z|F6Z?;hCCc`fko2<$$&)oV`A`;pxeLFus1TW52m9!N*qJ3$fRnoaxVe)b)xdnq2Wz zWp@dNIST1WIrW85;1HPTXNX2WLf#5obl!sL;yW>DU##!-4uWk_$$Qbp&nNmDB(CKr zF)MS>{5y{I9yy?k(|7eDfp z)@Rj>OH>wQhGsVMjXUO_S0AQz-skkSlet*dL6{O3mKd-(deYN66!#m}p_OM?_(avN z^DThC@TPsY8hp}85kOoWr#-2(3`QbB{Gx2f;em;1-Tj}aH{Fz7Wl8#A)x^FI4gex_ zS&ECF<}a%+m$SYor-ORx;dX5k*e0+|V4J`;f&U?a5=x_t#)WrJr}pf-6DAyGn0Bac zsNQy$W}- Date: Tue, 18 Mar 2025 16:43:42 +0800 Subject: [PATCH 9/9] workflows/docker: run `brew test-bot` on arm64 Linux builds We can stop `brew doctor` from throwing an error if we set `HOMEBREW_ARM64_TESTING`. --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3271c22bf3..5c4549a3cb 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -198,9 +198,9 @@ jobs: labels: ${{ needs.generate-tags.outputs.labels }} - name: Run brew test-bot --only-setup - # TODO: Remove this conditional when `brew doctor` no longer throws an error on ARM64 Linux. - if: matrix.arch == 'x86_64' - run: docker run --rm brew brew test-bot --only-setup + run: docker run --env HOMEBREW_ARM64_TESTING --rm brew brew test-bot --only-setup + env: + HOMEBREW_ARM64_TESTING: 1 - name: Log in to GitHub Packages (BrewTestBot) if: fromJSON(steps.attributes.outputs.push)