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.

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

Minor housekeeping #578

Merged
merged 3 commits into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Make.local
/.cache/
/certdb/
/compile_commands.json
/compile_commands.events.json
/cov-int/
/post-process-pe
/random.bin
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ ifneq ($(origin EFI_PATH),undefined)
$(error EFI_PATH is no longer supported, you must build using the supplied copy of gnu-efi)
endif

compile_commands.json : Makefile Make.rules Make.defaults
make clean
bear -- make COMPILER=clang test all

update :
git submodule update --init --recursive

Expand Down Expand Up @@ -322,7 +326,7 @@ clean-lib-objs:

clean-shim-objs:
@rm -rvf $(TARGET) *.o $(SHIM_OBJS) $(MOK_OBJS) $(FALLBACK_OBJS) $(KEYS) certdb $(BOOTCSVNAME)
@rm -vf *.debug *.so *.efi *.efi.* *.tar.* version.c buildid post-process-pe
@rm -vf *.debug *.so *.efi *.efi.* *.tar.* version.c buildid post-process-pe compile_commands.json
@rm -vf Cryptlib/*.[oa] Cryptlib/*/*.[oa]
@if [ -d .git ] ; then git clean -f -d -e 'Cryptlib/OpenSSL/*'; fi

Expand Down
1 change: 1 addition & 0 deletions cert.S
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ vendor_deauthorized:
#endif
.Lvendor_deauthorized_end:
.Lcert_table_end:
.section .note.GNU-stack,"a"
4 changes: 2 additions & 2 deletions include/console.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ extern UINT32 verbose;
dprint_(L"%a:%d:%a() " fmt, __FILE__, __LINE__ - 1, __func__, \
##__VA_ARGS__)
#else
#define dprint_(...)
#define dprint(fmt, ...)
#define dprint_(...) ({ ; })
#define dprint(fmt, ...) ({ ; })
#endif

extern EFI_STATUS EFIAPI vdprint_(const CHAR16 *fmt, const char *file, int line,
Expand Down
1 change: 1 addition & 0 deletions sbat_var.S
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ sbat_var_payload_header:
.Lsbat_var_latest:
.ascii SBAT_VAR_LATEST
.byte 0
.section .note.GNU-stack,"a"