On Wed, Jul 12, 2023 at 01:00:38PM +0200, Philippe Mathieu-Daudé wrote: > On 11/7/23 19:58, Daniel P. Berrangé wrote: > > On Tue, Jul 11, 2023 at 04:49:20PM +0200, Philippe Mathieu-Daudé wrote: > > > Refresh the generated files by running: > > > > > > $ make lcitool-refresh > > > > > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > > > --- > > > tests/docker/dockerfiles/debian-amd64.docker | 2 - > > > tests/docker/dockerfiles/ubuntu2004.docker | 2 - > > > tests/docker/dockerfiles/ubuntu2204.docker | 2 - > > > > I don't know why this would be removing xen/pmem from these files. If > > I run 'lcitool-refresh' on current git master that doesn't happen > > > > Do you have any other local changes on top ? >
> ((887cba855b...))$ make -C build lcitool-refresh > Generate tests/docker/dockerfiles/alpine.docker > Generate tests/docker/dockerfiles/centos8.docker > Generate tests/docker/dockerfiles/debian-amd64.docker > Generate tests/docker/dockerfiles/fedora.docker > Generate tests/docker/dockerfiles/opensuse-leap.docker > Generate tests/docker/dockerfiles/ubuntu2004.docker > Generate tests/docker/dockerfiles/ubuntu2204.docker > Generate tests/docker/dockerfiles/debian-amd64-cross.docker > Generate tests/docker/dockerfiles/debian-arm64-cross.docker > Generate tests/docker/dockerfiles/debian-armel-cross.docker > Generate tests/docker/dockerfiles/debian-armhf-cross.docker > Generate tests/docker/dockerfiles/debian-mips64el-cross.docker > Generate tests/docker/dockerfiles/debian-mipsel-cross.docker > Generate tests/docker/dockerfiles/debian-ppc64el-cross.docker > Generate tests/docker/dockerfiles/debian-riscv64-cross.docker > Generate tests/docker/dockerfiles/debian-s390x-cross.docker > Generate tests/docker/dockerfiles/fedora-win32-cross.docker > Generate tests/docker/dockerfiles/fedora-win64-cross.docker > Generate .gitlab-ci.d/cirrus/freebsd-13.vars > Generate .gitlab-ci.d/cirrus/macos-12.vars > ((887cba855b...))$ git diff -U0 > diff --git a/tests/docker/dockerfiles/debian-amd64.docker > b/tests/docker/dockerfiles/debian-amd64.docker > index e39871c7bb..8f7521fdc2 100644 > --- a/tests/docker/dockerfiles/debian-amd64.docker > +++ b/tests/docker/dockerfiles/debian-amd64.docker > @@ -73 +72,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libpmem-dev \ > @@ -99 +97,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libxen-dev \ > diff --git a/tests/docker/dockerfiles/ubuntu2004.docker > b/tests/docker/dockerfiles/ubuntu2004.docker > index 8f864d19e6..7f60143cbb 100644 > --- a/tests/docker/dockerfiles/ubuntu2004.docker > +++ b/tests/docker/dockerfiles/ubuntu2004.docker > @@ -72 +71,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libpmem-dev \ > @@ -97 +95,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libxen-dev \ > diff --git a/tests/docker/dockerfiles/ubuntu2204.docker > b/tests/docker/dockerfiles/ubuntu2204.docker > index 1d442cdfe6..5162927016 100644 > --- a/tests/docker/dockerfiles/ubuntu2204.docker > +++ b/tests/docker/dockerfiles/ubuntu2204.docker > @@ -73 +72,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libpmem-dev \ > @@ -99 +97,0 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > - libxen-dev \ What architecture are you running from ? I'm suspecting it is a non x86_64 architecture as these pacakges are both arch conditionalized. With 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 :|
