70 lines
3.0 KiB
Diff
70 lines
3.0 KiB
Diff
diff -up sbsigntools-0.9.3/configure.ac.gnu-efi sbsigntools-0.9.3/configure.ac
|
|
--- sbsigntools-0.9.3/configure.ac.gnu-efi 2020-02-03 09:38:56.000000000 +0100
|
|
+++ sbsigntools-0.9.3/configure.ac 2020-02-04 09:48:53.011259075 +0100
|
|
@@ -64,19 +64,30 @@ PKG_CHECK_MODULES(uuid, uuid,
|
|
AC_MSG_ERROR([libuuid (from the uuid package) is required]))
|
|
|
|
dnl gnu-efi headers require extra include dirs
|
|
-EFI_ARCH=$(uname -m | sed 's/i.86/ia32/;s/arm.*/arm/')
|
|
-AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "aarch64" ])
|
|
+EFI_ARCH=$(uname -m | sed -e 's/i.86/ia32/;s/arm.*/arm/' -e 's/x86_64/x64/' -e 's/aarch64/aa64/')
|
|
+AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "aa64" ])
|
|
|
|
##
|
|
# no consistent view of where gnu-efi should dump the efi stuff, so find it
|
|
##
|
|
-for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
|
|
- if test -e $path/crt0-efi-$EFI_ARCH.o; then
|
|
+AC_MSG_CHECKING([gnu-efi crt path])
|
|
+for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi /usr/lib/gnuefi/$EFI_ARCH ; do
|
|
+ if test -e $path/crt0.o; then
|
|
CRTPATH=$path
|
|
+ CRT=crt0.o
|
|
+ LDS=efi.lds
|
|
+ EFI_PATH=$path
|
|
+ elif test -e $path/crt0-efi-$EFI_ARCH.o; then
|
|
+ CRTPATH=$path
|
|
+ CRT=crt0-efi-${EFI_ARCH}.o
|
|
+ LDS=elf_${EFI_ARCH}_efi.lds
|
|
+ EFI_PATH=$libdir
|
|
fi
|
|
done
|
|
if test -z "$CRTPATH"; then
|
|
AC_MSG_ERROR([cannot find the gnu-efi crt path])
|
|
+else
|
|
+ AC_MSG_RESULT($CRTPATH)
|
|
fi
|
|
|
|
EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
|
|
@@ -88,6 +99,9 @@ CPPFLAGS="$CPPFLAGS_save"
|
|
AC_SUBST(EFI_CPPFLAGS, $EFI_CPPFLAGS)
|
|
AC_SUBST(EFI_ARCH, $EFI_ARCH)
|
|
AC_SUBST(CRTPATH, $CRTPATH)
|
|
+AC_SUBST(CRT, $CRT)
|
|
+AC_SUBST(LDS, $LDS)
|
|
+AC_SUBST(EFI_PATH, $EFI_PATH)
|
|
|
|
AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
|
|
[docs/Makefile tests/Makefile])
|
|
diff -up sbsigntools-0.9.3/tests/Makefile.am.gnu-efi sbsigntools-0.9.3/tests/Makefile.am
|
|
--- sbsigntools-0.9.3/tests/Makefile.am.gnu-efi 2020-02-03 09:38:56.000000000 +0100
|
|
+++ sbsigntools-0.9.3/tests/Makefile.am 2020-02-04 09:47:44.786665340 +0100
|
|
@@ -14,7 +14,7 @@ if TEST_BINARY_FORMAT
|
|
EFILDFLAGS = --defsym=EFI_SUBSYSTEM=0x0a
|
|
FORMAT = -O binary
|
|
else
|
|
-FORMAT = --target=efi-app-$(EFI_ARCH)
|
|
+FORMAT = --target=efi-app-$(EFI_ARCH:x64=x86_64)
|
|
endif
|
|
check_DATA = $(test_key) $(test_cert)
|
|
check_SCRIPTS = test-wrapper.sh
|
|
@@ -27,7 +27,7 @@ check_SCRIPTS = test-wrapper.sh
|
|
$(FORMAT) $^ $@
|
|
|
|
.$(OBJEXT).elf:
|
|
- $(LD) $(EFILDFLAGS) -nostdlib -L /usr/lib -L /usr/lib64 -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/crt0-efi-$(EFI_ARCH).o -T elf_$(EFI_ARCH)_efi.lds $< -o $@ -lefi -lgnuefi
|
|
+ $(LD) $(EFILDFLAGS) -nostdlib -L /usr/lib -L /usr/lib64 -L $(CRTPATH) -shared -Bsymbolic $(CRTPATH)/$(CRT) -T $(LDS) $< -o $@ $(EFI_PATH)/libefi.a $(EFI_PATH)/libgnuefi.a
|
|
|
|
AM_CFLAGS=-fpic -I/usr/include/efi -I/usr/include/efi/$(EFI_ARCH)
|
|
|