On Thu, Jan 14, 2021 at 06:50:36PM +0100, Philippe Mathieu-Daudé wrote: > Hi Alex, > > On 1/14/21 5:57 PM, Alex Bennée wrote: > > This is going to be helpful when we want to both test the tool > > integration and in the case of global generate a xref doc build. > > > > Signed-off-by: Alex Bennée <alex.ben...@linaro.org> > > --- > > tests/docker/dockerfiles/debian-amd64.docker | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/tests/docker/dockerfiles/debian-amd64.docker > > b/tests/docker/dockerfiles/debian-amd64.docker > > index 55075d9fce..a98314757d 100644 > > --- a/tests/docker/dockerfiles/debian-amd64.docker > > +++ b/tests/docker/dockerfiles/debian-amd64.docker > > @@ -1,7 +1,7 @@ > > # > > # Docker x86_64 target > > # > > -# This docker target builds on the debian Stretch base image. Further > > +# This docker target builds on the Debian Buster base image. Further > > # libraries which are not widely available are installed by hand. > > # > > FROM qemu/debian10 > > @@ -14,7 +14,10 @@ RUN apt update && \ > > RUN apt update && \ > > DEBIAN_FRONTEND=noninteractive eatmydata \ > > apt install -y --no-install-recommends \ > > + cscope \ > > genisoimage \ > > + exuberant-ctags \ > > + global \ > > This clash with Daniel's series which seems ready (and harder > to rebase): > > 'start using libvirt-ci's "lcitool" for dockerfiles' > https://www.mail-archive.com/qemu-devel@nongnu.org/msg772839.html > > Do you mind getting it merged before your patch?
I don't mind either way. I'll have to get mappings for those three packages added to libvirt-ci, so that we pull them in on the other non-debian distros too. Aside from that it is no big deal. > > > libbz2-dev \ > > liblzo2-dev \ > > libgcrypt20-dev \ > > > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|