tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/ubuntu.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - 3 files changed, 3 deletions(-)
Libcap was dropped from virtio-9p, so remove it from the dockerfiles as well.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/ubuntu.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
3 files changed, 3 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 4ddc7dd112..47732fc5d5 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 f486492224..ecea155646 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 3cc4f492c4..32a607471a 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 \
--
2.21.0
On Fri, 29 Nov 2019 16:08:01 +0100 Paolo Bonzini <pbonzini@redhat.com> wrote: > Libcap was dropped from virtio-9p, so remove it from the dockerfiles as well. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- Similarly to what was discussed in these threads: 20191129111632.22840-2-pbonzini@redhat.com 20191129142126.32967-1-dgilbert@redhat.com I'm ok to take this one in my tree as well if I get an ack from Alex or Fam. > tests/docker/dockerfiles/fedora.docker | 1 - > tests/docker/dockerfiles/ubuntu.docker | 1 - > tests/docker/dockerfiles/ubuntu1804.docker | 1 - > 3 files changed, 3 deletions(-) > > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > index 4ddc7dd112..47732fc5d5 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 f486492224..ecea155646 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 3cc4f492c4..32a607471a 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 \
On Mon, 2 Dec 2019 11:49:58 +0100 Greg Kurz <groug@kaod.org> wrote: > On Fri, 29 Nov 2019 16:08:01 +0100 > Paolo Bonzini <pbonzini@redhat.com> wrote: > > > Libcap was dropped from virtio-9p, so remove it from the dockerfiles as well. > > > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > Similarly to what was discussed in these threads: > > 20191129111632.22840-2-pbonzini@redhat.com > > 20191129142126.32967-1-dgilbert@redhat.com > > I'm ok to take this one in my tree as well if I get an ack from Alex > or Fam. > Oops, I didn't realize my mail client still had Fam's previous address... > > tests/docker/dockerfiles/fedora.docker | 1 - > > tests/docker/dockerfiles/ubuntu.docker | 1 - > > tests/docker/dockerfiles/ubuntu1804.docker | 1 - > > 3 files changed, 3 deletions(-) > > > > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > > index 4ddc7dd112..47732fc5d5 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 f486492224..ecea155646 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 3cc4f492c4..32a607471a 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 \ > >
Greg Kurz <groug@kaod.org> writes: > On Fri, 29 Nov 2019 16:08:01 +0100 > Paolo Bonzini <pbonzini@redhat.com> wrote: > >> Libcap was dropped from virtio-9p, so remove it from the dockerfiles as well. >> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- > > Similarly to what was discussed in these threads: > > 20191129111632.22840-2-pbonzini@redhat.com > > 20191129142126.32967-1-dgilbert@redhat.com > > I'm ok to take this one in my tree as well if I get an ack from Alex > or Fam. Acked-by: Alex Bennée <alex.bennee@linaro.org> > >> tests/docker/dockerfiles/fedora.docker | 1 - >> tests/docker/dockerfiles/ubuntu.docker | 1 - >> tests/docker/dockerfiles/ubuntu1804.docker | 1 - >> 3 files changed, 3 deletions(-) >> >> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker >> index 4ddc7dd112..47732fc5d5 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 f486492224..ecea155646 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 3cc4f492c4..32a607471a 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 \ -- Alex Bennée
© 2016 - 2024 Red Hat, Inc.