Skip to content

tpm2_eventlog: Fix pretty print for efivar 39 #3468

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

Merged
AndreasFuchsTPM merged 1 commit into from
Apr 17, 2025
Merged

tpm2_eventlog: Fix pretty print for efivar 39 #3468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,14 +650,20 @@ dist-hook:
done;

prepare-check:
if HAVE_EFIVAR_H
if HAVE_EFIVAR_GE_39
cp $(abs_top_srcdir)/test/integration/fixtures/event-pretty-39/event-*.yaml \
$(abs_top_srcdir)/test/integration/fixtures/
endif
if HAVE_EFIVAR_L_39
cp $(abs_top_srcdir)/test/integration/fixtures/event-pretty/event-*.yaml \
$(abs_top_srcdir)/test/integration/fixtures/
else
endif
if HAVE_EFIVAR_NO
cp $(abs_top_srcdir)/test/integration/fixtures/event-raw/event-*.yaml \
$(abs_top_srcdir)/test/integration/fixtures/
endif


check: prepare-check

if !HAVE_PANDOC
Expand Down
12 changes: 12 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@ AS_IF([test "x$with_efivar" = "xauto"],
AC_CHECK_HEADERS([efivar/efivar.h],[efivar_h=yes ], [efivar = no ])
AM_CONDITIONAL([HAVE_EFIVAR_H], [test "$efivar_h" = yes])

AS_IF([ test "x$efivar_h" = "xyes" ], [
EFIVAR_VERSION=`$PKG_CONFIG --modversion efivar`,
AX_COMPARE_VERSION([$EFIVAR_VERSION], [ge], [39],
[ efivar_version=ge39 ],
[ efivar_version=l39 ] ) ],
[ efivar_version=no ]
)

AM_CONDITIONAL([HAVE_EFIVAR_GE_39], [test "x$efivar_version" = "xge39" ])
AM_CONDITIONAL([HAVE_EFIVAR_L_39], [test "x$efivar_version" = "xl39" ])
AM_CONDITIONAL([HAVE_EFIVAR_NO], [test "x$efivar_version" = "xno" ])

# backwards compat with older pkg-config
# - pull in AC_DEFUN from pkg.m4
m4_ifndef([PKG_CHECK_VAR], [
Expand Down
686 changes: 686 additions & 0 deletions test/integration/fixtures/event-pretty-39/event-arch-linux.bin.yaml
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading