From 608e2f6a0f44e6b2f5b26426fd88067ae30dbc71 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 16 Feb 2026 17:58:42 +1000
Subject: [PATCH] CI: explicitly install GNU tar on Alpine

The default busybox tar we have installed fails
make distcheck with this error:

    if test -d "libevdev-1.13.6"; then find "libevdev-1.13.6" -type d ! -perm -700 -exec chmod u+rwx {} ';' ; rm -rf "libevdev-1.13.6" || { sleep 5 && rm -rf "libevdev-1.13.6"; }; else :; fi
    case 'libevdev-1.13.6.tar.xz' in \
    *.tar.gz*) \
    eval GZIP= gzip -dc libevdev-1.13.6.tar.gz | false ;;\
    *.tar.bz2*) \
    bzip2 -dc libevdev-1.13.6.tar.bz2 | false ;;\
    *.tar.bz3*) \
    bzip3 -dc libevdev-1.13.6.tar.bz3 | false ;;\
    *.tar.lz*) \
    lzip -dc libevdev-1.13.6.tar.lz | false ;;\
    *.tar.xz*) \
    xz -dc libevdev-1.13.6.tar.xz | false ;;\
    *.tar.Z*) \
    uncompress -c libevdev-1.13.6.tar.Z | false ;;\
    *.shar.gz*) \
    eval GZIP= gzip -dc libevdev-1.13.6.shar.gz | unshar ;;\
    *.zip*) \
    unzip libevdev-1.13.6.zip ;;\
    *.tar.zst*) \
    zstd -dc libevdev-1.13.6.tar.zst | false ;;\
    esac
    make: *** [Makefile:705: distcheck] Error 1

i.e. the output is piped to /bin/false - which is the default
placeholder for $am_untar which *should* be set to /bin/tar but busybox'
tar isn't compatible with whatever automake checks for.

Part-of: <https://gitlab.freedesktop.org/libevdev/libevdev/-/merge_requests/133>
---
 .gitlab-ci.yml        | 14 +++++++-------
 .gitlab-ci/config.yml |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fc6618..4a4520d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -75,37 +75,37 @@ variables:
 .fedora:43:
   extends: .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: '43'
 
 .ubuntu:25.10:
   extends: .fdo.distribution-image@ubuntu
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: '25.10'
 
 .debian:stable:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: 'stable'
 
 .debian:sid:
   extends: .fdo.distribution-image@debian
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: 'sid'
 
 .arch:rolling:
   extends: .fdo.distribution-image@arch
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: 'rolling'
 
 .alpine:latest:
   extends: .fdo.distribution-image@alpine
   variables:
-    FDO_DISTRIBUTION_TAG: '2026-01-16.0'
+    FDO_DISTRIBUTION_TAG: '2026-01-16.1'
     FDO_DISTRIBUTION_VERSION: 'latest'
 
 
@@ -186,7 +186,7 @@ check-merge-request:
 
 .alpine.packages:
   variables:
-    FDO_DISTRIBUTION_PACKAGES: 'git gcc g++ meson automake autoconf libtool make pkgconfig python3 check-dev valgrind binutils doxygen xz linux-headers'
+    FDO_DISTRIBUTION_PACKAGES: 'git gcc g++ meson automake autoconf libtool make pkgconfig python3 check-dev valgrind binutils doxygen xz linux-headers tar'
 
 
 
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 4f3a5d4..0747db3 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,7 +3,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2026-01-16.0'
+.default_tag: &default_tag '2026-01-16.1'
 
 distributions:
   - name: fedora
@@ -118,6 +118,7 @@ distributions:
       - doxygen
       - xz
       - linux-headers
+      - tar
 
 b2c:
   version: 2ff65156ba67fa8a0c309a4fc16c5df1a88a3844