diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 13:47:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 13:47:45 +0000 |
| commit | 35081f79fa8cd79f025aed0a906d4772598d536d (patch) | |
| tree | cd50417d46f22aa5406cd8f509b5f1b2424bffa6 /tests | |
| parent | ba9975025ecc85cc2a137636e667dd22a7ae3848 (diff) | |
| parent | b3e2bb9458af556cb8aa0558f59222f462b81069 (diff) | |
| download | qemu-35081f79fa8cd79f025aed0a906d4772598d536d.zip qemu-35081f79fa8cd79f025aed0a906d4772598d536d.tar.gz qemu-35081f79fa8cd79f025aed0a906d4772598d536d.tar.bz2 | |
Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2019-12-12' into staging
- conversion of virtfs-proxy-helper from libcap to libcap-ng
- removal of libcap-dev from docker, travis and gitlab CI
- removal of deprecate "-virtfs_synth" option
# gpg: Signature made Thu 12 Dec 2019 19:55:53 GMT
# gpg: using RSA key B4828BAF943140CEF2A3491071D4D5E5822F73D6
# gpg: Good signature from "Greg Kurz <groug@kaod.org>" [full]
# gpg: aka "Gregory Kurz <gregory.kurz@free.fr>" [full]
# gpg: aka "[jpeg image of size 3330]" [full]
# Primary key fingerprint: B482 8BAF 9431 40CE F2A3 4910 71D4 D5E5 822F 73D6
* remotes/gkurz/tags/9p-next-2019-12-12:
virtfs: Remove the deprecated "-virtfs_synth" option
travis.yml: Drop libcap-dev
ci: Use libcap-ng
docker: remove libcap development packages
virtfs-proxy-helper: switch from libcap to libcap-ng
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/dockerfiles/fedora.docker | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu.docker | 1 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu1804.docker | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4ddc7dd..47732fc 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -25,7 +25,6 @@ ENV PACKAGES \ libasan \ libattr-devel \ libblockdev-mpath-devel \ - libcap-devel \ libcap-ng-devel \ libcurl-devel \ libfdt-devel \ diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index f486492..ecea155 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -23,7 +23,6 @@ ENV PACKAGES flex bison \ libbrlapi-dev \ libbz2-dev \ libcacard-dev \ - libcap-dev \ libcap-ng-dev \ libcurl4-gnutls-dev \ libdrm-dev \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 3cc4f49..32a6074 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -12,7 +12,6 @@ ENV PACKAGES flex bison \ libbrlapi-dev \ libbz2-dev \ libcacard-dev \ - libcap-dev \ libcap-ng-dev \ libcurl4-gnutls-dev \ libdrm-dev \ |