RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: ci: enable crypto backends on Centos images 

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

Only the libsodium is enabled and verified to build, libgcrypt has
sufficient version on 8 but configure does not detect it for some
reason. Libkca is old on both.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2023-03-01 16:10:53 +01:00
parent 223fa4ca01
commit 9981a6767d
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci/ci-build-centos7
View File

@ -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 Centos 7 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-centos-7-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 --disable-libudev "$@"

7
ci/ci-build-centos8
View File

@ -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 Centos 8 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-centos-8-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 --disable-zoned
./docker-run -- ./test-build devel --disable-documentation --disable-libudev --disable-zoned "$@"

2
ci/images/ci-centos-7-x86_64/Dockerfile
View File

@ -20,6 +20,8 @@ RUN yum -y install wget
RUN yum -y install coreutils util-linux e2fsprogs findutils grep
RUN yum -y install udev device-mapper acl attr xz
RUN yum -y install libsodium-devel
# For debugging
RUN yum -y install less vim

2
ci/images/ci-centos-8-x86_64/Dockerfile
View File

@ -23,6 +23,8 @@ RUN yum -y install wget
RUN yum -y install util-linux e2fsprogs findutils grep
RUN yum -y install udev device-mapper acl attr xz
RUN yum -y install libsodium-devel
# For debugging
RUN yum -y install less vim