From 223fa4ca01228870eee8e727d0f3f867a090bb73 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 1 Mar 2023 16:10:53 +0100
Subject: [PATCH] btrfs-progs: ci: enable crypto backends on Leap image

Add the libaries and update script so additional configure parameters
can be passed. Also enable backtrace and libudev so it's closer to the
defaults.

Leap 15.3 properly builds only with libsodium, 15.4 with libgcrypt and
libsodium. Libkcapi is old on both.

Signed-off-by: David Sterba <dsterba@suse.com>
---
 ci/ci-build-leap153                               | 7 ++++---
 ci/ci-build-leap154                               | 7 ++++---
 ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile | 1 +
 ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile | 1 +
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ci/ci-build-leap153 b/ci/ci-build-leap153
index 786529ef..5eafa441 100755
--- a/ci/ci-build-leap153
+++ b/ci/ci-build-leap153
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Usage: $0 [branch]
+# Usage: $0 [branch] [configure options]
 # Create source tarball from HEAD or given branch and build it in openSUSE Leap 15.3 CI
-# environment
+# environment. Configure options follow branch name that can be empty.
 
 HERE=`pwd`
 if [ -f "configure.ac" ]; then
@@ -16,6 +16,7 @@ fi
 
 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.3-x86_64
 BRANCH=${1:-HEAD}
+shift
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
@@ -28,4 +29,4 @@ gzip --force --best devel.tar
 cd "$CIIMAGEDIR"
 cp "$SOURCEDIR/devel.tar.gz" .
 ./docker-build
-./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev
+./docker-run -- ./test-build devel --disable-documentation "$@"
diff --git a/ci/ci-build-leap154 b/ci/ci-build-leap154
index 3f24df49..07a6ddfc 100755
--- a/ci/ci-build-leap154
+++ b/ci/ci-build-leap154
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Usage: $0 [branch]
+# Usage: $0 [branch] [configure options]
 # Create source tarball from HEAD or given branch and build it in openSUSE Leap 15.4 CI
-# environment
+# environment. Configure options follow branch name that can be empty.
 
 HERE=`pwd`
 if [ -f "configure.ac" ]; then
@@ -16,6 +16,7 @@ fi
 
 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64
 BRANCH=${1:-HEAD}
+shift
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
@@ -28,4 +29,4 @@ gzip --force --best devel.tar
 cd "$CIIMAGEDIR"
 cp "$SOURCEDIR/devel.tar.gz" .
 ./docker-build
-./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev
+./docker-run -- ./test-build devel --disable-documentation "$@"
diff --git a/ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile b/ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile
index e904ea9a..11cf0dde 100644
--- a/ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile
+++ b/ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile
@@ -19,6 +19,7 @@ RUN zypper install -y --no-recommends udev device-mapper acl attr xz
 
 # For debugging
 RUN zypper install -y --no-recommends less vim
+RUN zypper install -y --no-recommends libsodium-devel
 
 COPY ./test-build .
 COPY ./run-tests .
diff --git a/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile b/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile
index c6285ea6..0b0f584a 100644
--- a/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile
+++ b/ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile
@@ -19,6 +19,7 @@ RUN zypper install -y --no-recommends udev device-mapper acl attr xz
 
 # For debugging
 RUN zypper install -y --no-recommends less vim
+RUN zypper install -y --no-recommends libgcrypt-devel libsodium-devel
 
 COPY ./test-build .
 COPY ./run-tests .