From 1a11144a7d3eff07ee66e697fc3ee4359aed2195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20H=C3=BCbner?= Date: Sun, 21 Apr 2024 17:46:46 +0200 Subject: [PATCH] packages/images: Reinclude xz for legacy branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Hübner --- roles/buildbot/files/packages.py | 2 +- roles/buildbot/files/targets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/buildbot/files/packages.py b/roles/buildbot/files/packages.py index cd22cbf..a9760c0 100644 --- a/roles/buildbot/files/packages.py +++ b/roles/buildbot/files/packages.py @@ -236,7 +236,7 @@ def packagesArchFactory(f, wwwPrefix, wwwURL, alpineVersion): """\ podman run -i --rm --log-driver=none docker.io/library/alpine:%(kw:alpineVersion)s sh -c '\ ( \ - apk add git bash wget zstd gzip unzip grep diffutils findutils coreutils build-base gcc abuild binutils ncurses-dev gawk bzip2 perl python3 rsync argp-standalone musl-fts-dev musl-obstack-dev musl-libintl \ + apk add git bash wget zstd xz gzip unzip grep diffutils findutils coreutils build-base gcc abuild binutils ncurses-dev gawk bzip2 perl python3 rsync argp-standalone musl-fts-dev musl-obstack-dev musl-libintl \ && git clone %(prop:repository)s /root/falter-packages \ && cd /root/falter-packages/ \ && git checkout %(prop:got_revision)s \ diff --git a/roles/buildbot/files/targets.py b/roles/buildbot/files/targets.py index aa4d66e..4c9b73b 100644 --- a/roles/buildbot/files/targets.py +++ b/roles/buildbot/files/targets.py @@ -347,7 +347,7 @@ def targetsTargetFactory(f, wwwPrefix, wwwURL, alpineVersion): """\ podman run -i --rm --log-driver=none docker.io/library/alpine:%(kw:alpineVersion)s sh -c '\ ( \ - apk add git bash wget zstd gzip unzip grep diffutils findutils coreutils build-base gcc abuild binutils ncurses-dev gawk bzip2 gettext perl python3 rsync sqlite flex libxslt \ + apk add git bash wget zstd xz gzip unzip grep diffutils findutils coreutils build-base gcc abuild binutils ncurses-dev gawk bzip2 gettext perl python3 rsync sqlite flex libxslt \ && git clone %(prop:repository)s /root/falter-builter \ && cd /root/falter-builter/ \ && git checkout %(prop:got_revision)s \