RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-11 17:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: ci: enable crypto backends on Leap image

Browse Source 
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>
This commit is contained in:
David Sterba 2023-03-01 16:10:53 +01:00
parent d8b66fe2e2
commit 223fa4ca01
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ci/ci-build-leap153
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/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 # 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` HERE=`pwd`
if [ -f "configure.ac" ]; then if [ -f "configure.ac" ]; then
@ -16,6 +16,7 @@ fi
CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.3-x86_64 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.3-x86_64
BRANCH=${1:-HEAD} BRANCH=${1:-HEAD}
shift
HASH=$(git log -1 --format='%h %s' "$BRANCH") HASH=$(git log -1 --format='%h %s' "$BRANCH")
echo "CI: Generate archive from $BRANCH ($HASH)" echo "CI: Generate archive from $BRANCH ($HASH)"
@ -28,4 +29,4 @@ gzip --force --best devel.tar
cd "$CIIMAGEDIR" cd "$CIIMAGEDIR"
cp "$SOURCEDIR/devel.tar.gz" . cp "$SOURCEDIR/devel.tar.gz" .
./docker-build ./docker-build
./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev ./docker-run -- ./test-build devel --disable-documentation "$@"

7
ci/ci-build-leap154
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/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 # 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` HERE=`pwd`
if [ -f "configure.ac" ]; then if [ -f "configure.ac" ]; then
@ -16,6 +16,7 @@ fi
CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64
BRANCH=${1:-HEAD} BRANCH=${1:-HEAD}
shift
HASH=$(git log -1 --format='%h %s' "$BRANCH") HASH=$(git log -1 --format='%h %s' "$BRANCH")
echo "CI: Generate archive from $BRANCH ($HASH)" echo "CI: Generate archive from $BRANCH ($HASH)"
@ -28,4 +29,4 @@ gzip --force --best devel.tar
cd "$CIIMAGEDIR" cd "$CIIMAGEDIR"
cp "$SOURCEDIR/devel.tar.gz" . cp "$SOURCEDIR/devel.tar.gz" .
./docker-build ./docker-build
./docker-run -- ./test-build devel --disable-documentation --disable-backtrace --disable-libudev ./docker-run -- ./test-build devel --disable-documentation "$@"

1
ci/images/ci-openSUSE-Leap-15.3-x86_64/Dockerfile
View File

@ -19,6 +19,7 @@ RUN zypper install -y --no-recommends udev device-mapper acl attr xz
# For debugging # For debugging
RUN zypper install -y --no-recommends less vim RUN zypper install -y --no-recommends less vim
RUN zypper install -y --no-recommends libsodium-devel
COPY ./test-build . COPY ./test-build .
COPY ./run-tests . COPY ./run-tests .

1
ci/images/ci-openSUSE-Leap-15.4-x86_64/Dockerfile
View File

@ -19,6 +19,7 @@ RUN zypper install -y --no-recommends udev device-mapper acl attr xz
# For debugging # For debugging
RUN zypper install -y --no-recommends less vim RUN zypper install -y --no-recommends less vim
RUN zypper install -y --no-recommends libgcrypt-devel libsodium-devel
COPY ./test-build . COPY ./test-build .
COPY ./run-tests . COPY ./run-tests .