On Tue, 5 Dec 2023, Andrew Cooper wrote:
> 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 causing
> bloat. texinfo isn't a runtime dependency, and we should be using xz itself,
> not it's development libraries.
>
> Signed-off-by: Andrew Cooper
Reviewed-by: Stefano Stabellini
> ---
> CC: Anthony PERARD
> CC: Stefano Stabellini
> CC: Michal Orzel
> CC: Doug Goldstein
> CC: Roger Pau Monné
>
> I've already pushed the x86 container as part of confirming the fix.
> ---
> 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 94f69621f40e..0e5ae7f2b4d8 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 f1b4a8b7a191..9cde6c9ad4da 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 / && \
>
> base-commit: ff1178062094837d55ef342070e58316c43a54c9
> prerequisite-patch-id: 477e3af5692ee0daa13d795fdf78384be604fd66
> prerequisite-patch-id: 60d13b1c04d8a808a42d20b3432270cfd87a47fc
> prerequisite-patch-id: 457b56a295e75d2d9f837b44cd483812ca66cd85
> --
> 2.30.2
>