[xen master] CI: Fix fallout from adding elfutils-dev to the build container

[patchbot@xxxxxxx]

commit 4c6142a1ab004be132f386da3cabce07b44fac2d
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Dec 5 21:54:25 2023 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Dec 5 23:02:18 2023 +0000

    CI: Fix fallout from adding elfutils-dev to the build container
    
    Commit 948e03303138 ("automation/alpine: add elfutils-dev") had an 
unintended
    consequence of causing Qemu to gain a runtime dependency on libdw.so
    
    The {adl,zen3p}-pci-hvm-x86-64-gcc-debug tests, which are the only two tests
    that run the built Qemu, started failing with:
    
      Error loading shared library libdw.so.1: No such file or directory 
(needed by /usr/local/lib/xen/bin/qemu-system-i386)
      Error relocating /usr/local/lib/xen/bin/qemu-system-i386: dwfl_begin: 
symbol not found
    
    Update the test container with libelf to cope.
    
    While editing the runtime dependency list, fix up two other problems.  
texinfo
    isn't a runtime dependency, and we should be using xz itself, not it's
    development libraries.  Both changes shrink the initrd used for tests.
    
    Fixes: 948e03303138 ("automation/alpine: add elfutils-dev")
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
---
 automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 3 +--
 automation/tests-artifacts/alpine/3.18.dockerfile         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile 
b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
index 94f69621f4..0e5ae7f2b4 100644
--- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
+++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile
@@ -21,10 +21,9 @@ RUN \
   apk add python3 && \
   apk add zlib && \
   apk add ncurses && \
-  apk add texinfo && \
   apk add yajl && \
   apk add libaio && \
-  apk add xz-dev && \
+  apk add xz && \
   apk add util-linux && \
   apk add argp-standalone && \
   apk add libfdt && \
diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile 
b/automation/tests-artifacts/alpine/3.18.dockerfile
index f1b4a8b7a1..9cde6c9ad4 100644
--- a/automation/tests-artifacts/alpine/3.18.dockerfile
+++ b/automation/tests-artifacts/alpine/3.18.dockerfile
@@ -22,10 +22,9 @@ RUN \
   apk add python3 && \
   apk add zlib && \
   apk add ncurses && \
-  apk add texinfo && \
   apk add yajl && \
   apk add libaio && \
-  apk add xz-dev && \
+  apk add xz && \
   apk add util-linux && \
   apk add argp-standalone && \
   apk add libfdt && \
@@ -34,6 +33,7 @@ RUN \
   apk add curl && \
   apk add udev && \
   apk add pciutils && \
+  apk add libelf && \
   \
   # Xen
   cd / && \
--
generated by git-patchbot for /home/xen/git/xen.git#master