Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Fix cirrus ci after update of FreeBSD to 14.1 #2911

Merged
merged 3 commits into from
Oct 31, 2024
Merged

CI: Fix cirrus ci after update of FreeBSD to 14.1 #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b322238
cirrus-ci: update freeBsd to 14.1
JuergenReppSIT Oct 20, 2024
b38f5e6
Makefile.am Add libtss2_tcti_swtpm to src_tss2_esys_libtss2_esys_la_L…
JuergenReppSIT Oct 21, 2024
2b1fc2c
cirrus-ci: use configure option --enable-nodl
JuergenReppSIT Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ task:
env:
CFLAGS: "-I/usr/local/include -I/usr/local/openssl/include"
LDFLAGS: -L/usr/local/lib
ibmtpm_name: ibmtpm1637
libusb_version: v1.0.26
freebsd_instance:
matrix:
image_family: freebsd-14-0
image_family: freebsd-14-1
install_script:
- IGNORE_OSVERSION=yes
- pkg update -f
Expand All @@ -23,5 +22,5 @@ task:
# Due to a race condition that only occurs in the cirrus ci, "make distcheck" has been replaced by "make check".
#
./bootstrap &&
./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --disable-dependency-tracking &&
./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --enable-nodl --disable-dependency-tracking &&
gmake -j check || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ src_tss2_esys_libtss2_esys_la_SOURCES = $(TSS2_ESYS_SRC) $(TSS2_ESYS_SRC_CRYPTO)
src/tss2-tcti/tctildr.c src/tss2-tcti/tctildr.h \
src/tss2-tcti/tctildr-interface.h
if NO_DL
src_tss2_esys_libtss2_esys_la_LIBADD += $(libtss2_tcti_device) $(libtss2_tcti_mssim) $(libtss2_tcti_cmd)
src_tss2_esys_libtss2_esys_la_LIBADD += $(libtss2_tcti_device) $(libtss2_tcti_mssim) $(libtss2_tcti_cmd) $(libtss2_tcti_swtpm)
src_tss2_esys_libtss2_esys_la_SOURCES += src/tss2-tcti/tctildr-nodl.c src/tss2-tcti/tctildr-nodl.h
else
src_tss2_esys_libtss2_esys_la_LIBADD += $(LIBADD_DL)
Expand Down
Loading