diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-29 18:49:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-29 18:49:39 +0100 |
| commit | 7742fe64e5c2c2c9f9787d107b693eaac602eaae (patch) | |
| tree | 0ba8811c5399056073f4d9402df8dce6c161c8c1 /tests | |
| parent | 768832575d2e37042d00eb693cda809cb30981d4 (diff) | |
| parent | 30a20f2c5a9cf8f01ffcc918a7a5751dfe956524 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20210729-pull-request' into staging
usb: fixes for 6.1: usbredir, usb-host for windows, docs.
# gpg: Signature made Thu 29 Jul 2021 13:50:32 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20210729-pull-request:
docs: Fold usb2.txt passthrough information into usb.rst
docs: Fold usb2.txt physical port addressing info into usb.rst
docs: Fold usb2.txt USB controller information into usb.rst
docs: Incorporate information in usb-storage.txt into rST manual
usbredir: fix free call
ci: add libusb for windows builds
usb-host: wire up timer for windows
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/dockerfiles/fedora-win32-cross.docker | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/fedora-win64-cross.docker | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 5a03e1af43..aad39dd97f 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -23,6 +23,7 @@ ENV PACKAGES \ mingw32-libjpeg-turbo \ mingw32-libpng \ mingw32-libtasn1 \ + mingw32-libusbx \ mingw32-nettle \ mingw32-nsis \ mingw32-pixman \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index d3f13666e8..9a224a619b 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -23,6 +23,7 @@ ENV PACKAGES \ mingw64-libjpeg-turbo \ mingw64-libpng \ mingw64-libtasn1 \ + mingw64-libusbx \ mingw64-pixman \ mingw64-pkg-config \ perl \ |