Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[macOS] Update flasher binaries from Catalina bottles #342

Merged
merged 2 commits into from
Apr 18, 2022

Conversation

fauxpark
Copy link
Member

Description

avrdude 6.4-1
https://ghcr.io/v2/homebrew/core/avrdude/blobs/sha256:f7c8d3e57f8ac80d916e4974009c8032e4e981f91d56aa016c3fd8cfe13e8723

bootloadhid 2012-12-08
https://ghcr.io/v2/homebrew/core/bootloadhid/blobs/sha256:aa0bc95a39610d6b5951d064d781d85b898ca2ebf230acbc60aa2f4e1f51e573

dfu-programmer 0.7.2
https://ghcr.io/v2/homebrew/core/dfu-programmer/blobs/sha256:5ff077a2c2198fc345e429246a560ca4a13fea2a9dbb9a0feb6fe4cbdfa46a4a

dfu-util 0.11
https://ghcr.io/v2/homebrew/core/dfu-util/blobs/sha256:5a5d86794a00b9559ffc819715c297da4f477296d20a92c804aefc426795d0b0

libftdi0 0.20
https://ghcr.io/v2/homebrew/core/libftdi0/blobs/sha256:064e2f32a4a8959f2a489611c931beac426f509a8299bbcdd03871b1d5f5859e

libusb-compat 0.1.5-1
https://ghcr.io/v2/homebrew/core/libusb-compat/blobs/sha256:e1f03f77caed5418c50c3c9659e6c56f2363eddfd6cc1aac3f8dcac9451771d2

libusb 1.0.26
https://ghcr.io/v2/homebrew/core/libusb/blobs/sha256:72ed40aec0356157f3d5071ecb28c481b3f3502985a320ec1848cdc8cf8483c1

teensy_loader_cli 2.2
https://ghcr.io/v2/homebrew/core/teensy_loader_cli/blobs/sha256:5f622de032367bbd7d3325e1e3d88ee205f941908a111102cbb10d176474e197

Download with:

wget --header="Authorization: Bearer QQ==" <url> -O <formula>.tar.gz

It turns out skopeo is not needed, you can just give it a dummy auth token. Much easier!

Fix Homebrew placeholders:

install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb/lib/libusb-1.0.0.dylib" "@executable_path/../Frameworks/libusb-1.0.0.dylib" avrdude
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libftdi0/lib/libftdi.1.dylib" "@executable_path/../Frameworks/libftdi.1.dylib" avrdude
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb-compat/lib/libusb-0.1.4.dylib" "@executable_path/../Frameworks/libusb-0.1.4.dylib" avrdude
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/hidapi/lib/libhidapi.0.dylib" "@executable_path/../Frameworks/libhidapi.0.dylib" avrdude
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb-compat/lib/libusb-0.1.4.dylib" "@executable_path/../Frameworks/libusb-0.1.4.dylib" bootloadHID
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb-compat/lib/libusb-0.1.4.dylib" "@executable_path/../Frameworks/libusb-0.1.4.dylib" dfu-programmer
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb/lib/libusb-1.0.0.dylib" "@executable_path/../Frameworks/libusb-1.0.0.dylib" dfu-util
install_name_tool -id "@executable_path/../Frameworks/libftdi.1.dylib" libftdi.1.dylib
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb-compat/lib/libusb-0.1.4.dylib" "@executable_path/../Frameworks/libusb-0.1.4.dylib" libftdi.1.dylib
install_name_tool -id "@executable_path/../Frameworks/libusb-0.1.4.dylib" libusb-0.1.4.dylib
install_name_tool -change "@@HOMEBREW_PREFIX@@/opt/libusb/lib/libusb-1.0.0.dylib" "@executable_path/../Frameworks/libusb-1.0.0.dylib" libusb-0.1.4.dylib
install_name_tool -id "@executable_path/../Frameworks/libusb-1.0.0.dylib" libusb-1.0.0.dylib

avrdude seems to now reference libhidapi, apparently because it now supports flashing HalfKay. But the Toolbox will still use teensy_loader_cli for that, so I haven't bothered adding the dylib.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Documentation

Issues Fixed or Closed by This PR

@fauxpark fauxpark requested a review from a team April 17, 2022 14:04
@tzarc tzarc merged commit 7333952 into qmk:master Apr 18, 2022
@fauxpark fauxpark deleted the macos-update-binaries branch April 18, 2022 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants