Skip to content

Commit 52287a2

Browse files
authored
Merge pull request #65 from AkihiroSuda/dev
unpin libslirp v4.5.0
2 parents 1a3b973 + 5b415c6 commit 52287a2

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ jobs:
6464
run: make
6565
- name: Install
6666
run: make install
67-
- name: Install libslirp v4.5.0 explicitly (v4.6.0 is broken)
68-
# Workaround until https://gitlab.freedesktop.org/slirp/libslirp/-/issues/48 gets fixed
69-
# and packaged in homebrew
70-
run: |
71-
cd /tmp
72-
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a53ffe2362d2a7e55fd1a8a9bc71c1ec15bb00/Formula/libslirp.rb
73-
brew install ./libslirp.rb
74-
brew pin libslirp
75-
rm -f libslirp.rb
7667
- name: Install test dependencies
7768
# QEMU: required by Lima itself
7869
# bash: required by test-example.sh (OS version of bash is too old)

README.md

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,6 @@ For the usage of containerd and nerdctl (contaiNERD ctl), visit https://github.c
7979
### Requirements (Intel Mac)
8080
- QEMU v6.0.0 or later (`brew install qemu`)
8181

82-
NOTE: libslirp v4.6.0 used by QEMU is known to be [broken](https://gitlab.freedesktop.org/slirp/libslirp/-/issues/48).
83-
If you have libslirp v4.6.0 in `/usr/local/Cellar/libslirp`, you have to downgrade it to v4.5.0:
84-
85-
```console
86-
brew uninstall --ignore-dependencies libslirp
87-
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a53ffe2362d2a7e55fd1a8a9bc71c1ec15bb00/Formula/libslirp.rb
88-
brew install ./libslirp.rb
89-
brew pin libslirp
90-
```
91-
9282
### Requirements (ARM Mac)
9383

9484
- QEMU with `--accel=hvf` support, see https://gist.github.com/nrjdalal/e70249bb5d2e9d844cc203fd11f74c55
@@ -297,14 +287,7 @@ Privileged ports (1-1023) cannot be forwarded. e.g., you have to use 8080, not 8
297287
#### stuck on "Waiting for the essential requirement 1 of X: "ssh"
298288

299289
libslirp v4.6.0 used by QEMU is known to be [broken](https://gitlab.freedesktop.org/slirp/libslirp/-/issues/48).
300-
If you have libslirp v4.6.0 in `/usr/local/Cellar/libslirp`, you have to downgrade it to v4.5.0:
301-
302-
```console
303-
brew uninstall --ignore-dependencies libslirp
304-
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a53ffe2362d2a7e55fd1a8a9bc71c1ec15bb00/Formula/libslirp.rb
305-
brew install ./libslirp.rb
306-
brew pin libslirp
307-
```
290+
If you have libslirp v4.6.0 in `/usr/local/Cellar/libslirp`, you have to upgrade it to v4.6.1 or later (`brew upgrade`).
308291

309292
#### error "field SSHPubKeys must be set"
310293

0 commit comments

Comments
 (0)