efi-boot-shim.git/Make.defaults, branch 15.3

Fix cross-compilation from x86_64->i686

2021-03-22T20:43:44+00:00

Signed-off-by: Peter Jones

build: load local build configuration from Make.local if present

2021-03-16T17:23:17+00:00

If the file Make.local exists, use it as a source of local build configuration by including it in Make.defaults. (cherry picked from commit 57e38a1ebf73 in the shim-15.2 branch) Signed-off-by: Paul Moore

Stop using EFI_PATH, and error out if people try to use it

2021-03-15T23:50:53+00:00

We need to be using our patched version of gnu-efi Signed-off-by: Steve McIntyre <93sam@debian.org>

Fix include order

2021-03-12T09:15:01+00:00

scan-build helpfully notes: | In file included from shim.c:14: | In file included from /home/pjones/devel/github.com/shim/sbat-aarch64/shim.h:183: | /home/pjones/devel/github.com/shim/sbat-aarch64/include/hexdump.h:123:2: error: 'va_start' used in Win64 ABI function | va_start(ap, at); | ^ | /usr/lib/gcc/x86_64-redhat-linux/10/include/stdarg.h:47:23: note: expanded from macro 'va_start' | #define va_start(v,l) __builtin_va_start(v,l) | ^ This is because one of the patches for the builtin swizzling is missing a correction for the include order. This patch fixes that order. Signed-off-by: Peter Jones

Fix compilation for older gcc

2021-03-10T21:41:32+00:00

Signed-off-by: Alex Burmashev

make: use -Wextra (minus some obnoxious bits)

2021-03-10T20:54:20+00:00

gcc -Wextra, has a lot of good, useful checks, a few obnoxious checks, and a few absolutely insane checks. This enables -Wextra, but disables -Wmissing-field-initializers, because it is irrational nonsense that just leads to worse code. It also disables some specific things in the Cryptlib and Cryptlib/OpenSSL trees: Both: -Wno-unused-parameter - there are a fair number of functions that have to conform to some API or another but have arguments that are unused, but haven't been marked with UNUSED; we don't need to see warnings about them. Cryptlib/OpenSSL: -Wno-empty-body - functions that exist merely to populate some API -Wno-implicit-fallthrough - these probably should get fixed someday, but I bet upstream will do it and rebasing will solve it -Wno-old-style-declaration - this gripes if you write "const static" instead of "static const". Again I expect rebasing will fix it at some point. -Wno-unused-but-set-variable - self explanatory, and again, I expect a rebase to solve it someday. Signed-off-by: Peter Jones

Fix stdarg to work the same everywhere.

2021-03-10T20:54:20+00:00

This gets us the same working definition for VA_* va_* etc everywhere, and it's the same definition edk2 is using. Signed-off-by: Peter Jones

Fix Cryptlib's va_* definitions.

2021-03-10T20:54:20+00:00

Some time ago, commit e571428e212 ("Update to openssl to 1.0.2e") changed the way we define the va_* (and VA_*) functions and macros. Unfortunately, it only changed for some parts of the tree, and the different parts of the tree need to both call each other and use the same types in all cases. Additionally, they need to all be able to call gnu-efi functions such as VPrint, which means they need the same va_list type definitions everywhere. This partially reverts that patch, adding EFIAPI back and unsetting NO_BUILTIN_VA_FUNCS everywhere.

Restructure our includes.

2021-03-10T20:54:20+00:00

This re-structures our includes so we can be sure everything is always including all the system headers in a uniform, predictable way. Temporarily it also adds a bunch of junk at all the places we use variadic functions to specifically pick either the MS (cdecl) or ELF ABIs. I'm not 100% sure that's all correct (see later patch) but it's enough to allow this to build. Signed-off-by: Peter Jones

build: Import gnu-efi as a submodule and build against it

2021-03-09T21:52:53+00:00

Shim is rather more friendly with EFI internals than most code, and as a result can end up making assumptions that are out of step with those made by gnu-efi. Since both projects are developed independently, and since distributions are often trying to build versions of shim against whatever version of gnu-efi they are shipping, this can result in awkward build failures. The easiest way to handle this is to use a git submodule and import a known-good version of shim directly into the build tree. Given static linking, this will also make reproducible builds easier. Plus some changes from pjones: - Fix up some more include paths - more fine grained clean rules - use our make ARCH - use an rhboot/ repo for the gnu-efi remote Signed-off-by: Matthew Garrett