mirrors/meta-secure-core
1
0
Fork 0
mirror of https://github.com/jiazhang0/meta-secure-core.git synced 2026-07-16 20:56:58 +00:00
Code Issues Projects Releases Wiki Activity

efitools: Rework how we deal with rpath and linking of Linux apps

Browse Source 
- In all cases, when building Linux apps (and thus linking with gcc) we
  need to pass in the normal set of LDFLAGS for both rpath and link hash
  type.
- Rework Fix-for-the-cross-compilation.patch a bit.  When linking EFI
  apps (and thus linking with ld) we don't need to pass in other special
  flags.  When linking the "openssl" apps we do not need to spell out
  the crtN files as gcc handles that for us, they are normal Linux apps.
  Ensure that all Linux apps get our EXTRA_LDFLAGS passed in.

With all of these changes we are now able to reuse sstate cache between
build directories.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2018-05-01 20:42:20 -04:00
committed by Jia Zhang
parent 15a25c9a4a
commit e00aed3e08
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efi-secure-boot/recipes-bsp/efitools/efitools-native_git.bb
-1
View File
@@ -7,5 +7,4 @@ inherit native
EXTRA_OEMAKE_append = "\ EXTRA_OEMAKE_append = "\
INCDIR_PREFIX='${STAGING_DIR_NATIVE}' \ INCDIR_PREFIX='${STAGING_DIR_NATIVE}' \
CRTPATH_PREFIX='${STAGING_DIR_NATIVE}' \ CRTPATH_PREFIX='${STAGING_DIR_NATIVE}' \
EXTRA_LDFLAGS='-Wl,-rpath,${libdir}' \
" "
meta-efi-secure-boot/recipes-bsp/efitools/efitools.inc
+1 -4
View File
@@ -45,14 +45,11 @@ EXTRA_OEMAKE = "\
SBSIGN='${STAGING_BINDIR_NATIVE}/sbsign' \ SBSIGN='${STAGING_BINDIR_NATIVE}/sbsign' \
NM='${NM}' AR='${AR}' \ NM='${NM}' AR='${AR}' \
OPENSSL_LIB='${STAGING_LIBDIR_NATIVE}' \ OPENSSL_LIB='${STAGING_LIBDIR_NATIVE}' \
EXTRA_LDFLAGS='${LDFLAGS}' \
" "
EXTRA_OEMAKE_append_x86 += " ARCH=ia32" EXTRA_OEMAKE_append_x86 += " ARCH=ia32"
EXTRA_OEMAKE_append_x86-64 += " ARCH=x86_64" EXTRA_OEMAKE_append_x86-64 += " ARCH=x86_64"
# LDFLAGS is used by LD not CC, so remove '-Wl,'
LDFLAGS := "${@oe.utils.str_filter_out('-Wl,', '${LDFLAGS}', d)}"
BUILD_LDFLAGS := "${@oe.utils.str_filter_out('-Wl,', '${BUILD_LDFLAGS}', d)}"
EFI_BOOT_PATH = "/boot/efi/EFI/BOOT" EFI_BOOT_PATH = "/boot/efi/EFI/BOOT"
do_compile_prepend() { do_compile_prepend() {
meta-efi-secure-boot/recipes-bsp/efitools/efitools/Fix-for-the-cross-compilation.patch
+26 -24
View File
@@ -7,15 +7,15 @@ Upstream-Status: Pending
Signed-off-by: Lans Zhang <jia.zhang@windriver.com> Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
--- ---
Make.rules | 52 +++++++++++++++++++++++++++++----------------------- Make.rules | 51 ++++++++++++++++++++++++++++-----------------------
Makefile | 14 +++++++------- Makefile | 12 ++++++------
2 files changed, 36 insertions(+), 30 deletions(-) 2 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/Make.rules b/Make.rules diff --git a/Make.rules b/Make.rules
index 88d5481..7e89332 100644 index 88d5481bef6a..c794a621095b 100644
--- a/Make.rules --- a/Make.rules
+++ b/Make.rules +++ b/Make.rules
@@ -13,21 +13,27 @@ ARCH3264 = @@ -13,21 +13,26 @@ ARCH3264 =
else else
$(error unknown architecture $(ARCH)) $(error unknown architecture $(ARCH))
endif endif
@@ -26,7 +26,7 @@ index 88d5481..7e89332 100644
+INCDIR = -I$(TOPDIR)include/ -I$(INCDIR_PREFIX)/usr/include/efi -I$(INCDIR_PREFIX)/usr/include/efi/$(ARCH) -I$(INCDIR_PREFIX)/usr/include/efi/protocol +INCDIR = -I$(TOPDIR)include/ -I$(INCDIR_PREFIX)/usr/include/efi -I$(INCDIR_PREFIX)/usr/include/efi/$(ARCH) -I$(INCDIR_PREFIX)/usr/include/efi/protocol
+cppflags = -DCONFIG_$(ARCH) +cppflags = -DCONFIG_$(ARCH)
+cflags = -O2 $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check $(CFLAGS) +cflags = -O2 $(ARCH3264) -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants -fno-stack-protector -ffreestanding -fno-stack-check $(CFLAGS)
+ldflags = -nostdlib $(LDFLAGS) +ldflags = -nostdlib
CRTOBJ = crt0-efi-$(ARCH).o CRTOBJ = crt0-efi-$(ARCH).o
CRTPATHS = /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi CRTPATHS = /lib /lib64 /lib/efi /lib64/efi /usr/lib /usr/lib64 /usr/lib/efi /usr/lib64/efi
-CRTPATH = $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done) -CRTPATH = $(shell for f in $(CRTPATHS); do if [ -e $$f/$(CRTOBJ) ]; then echo $$f; break; fi; done)
@@ -37,7 +37,6 @@ index 88d5481..7e89332 100644
LDSCRIPT = elf_$(ARCH)_efi.lds LDSCRIPT = elf_$(ARCH)_efi.lds
-LDFLAGS += -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT) -LDFLAGS += -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT)
+ldflags += -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT) +ldflags += -shared -Bsymbolic $(CRTOBJS) -L $(CRTPATH) -T $(LDSCRIPT)
+ldflags_openssl = $(addprefix -L$(CRTPATH_PREFIX),$(CRTPATHS))
LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name) LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
FORMAT = --target=efi-app-$(ARCH) FORMAT = --target=efi-app-$(ARCH)
OBJCOPY = objcopy OBJCOPY = objcopy
@@ -49,7 +48,7 @@ index 88d5481..7e89332 100644
MYGUID = 11111111-2222-3333-4444-123456789abc MYGUID = 11111111-2222-3333-4444-123456789abc
INSTALL = install INSTALL = install
BINDIR = $(DESTDIR)/usr/bin BINDIR = $(DESTDIR)/usr/bin
@@ -36,23 +42,23 @@ EFIDIR = $(DESTDIR)/usr/share/efitools/efi @@ -36,23 +41,23 @@ EFIDIR = $(DESTDIR)/usr/share/efitools/efi
DOCDIR = $(DESTDIR)/usr/share/efitools DOCDIR = $(DESTDIR)/usr/share/efitools
# globally use EFI calling conventions (requires gcc >= 4.7) # globally use EFI calling conventions (requires gcc >= 4.7)
@@ -78,7 +77,7 @@ index 88d5481..7e89332 100644
FORMAT = -O binary FORMAT = -O binary
endif endif
@@ -61,12 +67,12 @@ endif @@ -61,12 +66,12 @@ endif
-j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \ -j .rel -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
-j .reloc $(FORMAT) $*.so $@ -j .reloc $(FORMAT) $*.so $@
%.so: %.o %.so: %.o
@@ -94,7 +93,7 @@ index 88d5481..7e89332 100644
%.hash: %.efi hash-to-efi-sig-list %.hash: %.efi hash-to-efi-sig-list
./hash-to-efi-sig-list $< $@ ./hash-to-efi-sig-list $< $@
@@ -99,28 +105,28 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec @@ -99,28 +104,28 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec
./sign-efi-sig-list -a -c PK.crt -k PK.key dbx $< $@ ./sign-efi-sig-list -a -c PK.crt -k PK.key dbx $< $@
%.o: %.c %.o: %.c
@@ -131,7 +130,7 @@ index 88d5481..7e89332 100644
## ##
# No need for KEK signing # No need for KEK signing
@@ -129,7 +135,7 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec @@ -129,7 +134,7 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec
# sbsign --key KEK.key --cert KEK.crt --output $@ $< # sbsign --key KEK.key --cert KEK.crt --output $@ $<
%.a: %.a:
@@ -141,7 +140,7 @@ index 88d5481..7e89332 100644
doc/%.1: doc/%.1.in % doc/%.1: doc/%.1.in %
$(HELP2MAN) --no-info -i $< -o $@ ./$* $(HELP2MAN) --no-info -i $< -o $@ ./$*
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 774ee0a..46e4620 100644 index 774ee0aed7e9..4c3f91b5850f 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -73,7 +73,7 @@ ms-%.esl: ms-%.crt cert-to-efi-sig-list @@ -73,7 +73,7 @@ ms-%.esl: ms-%.crt cert-to-efi-sig-list
@@ -153,41 +152,44 @@ index 774ee0a..46e4620 100644
rm -f /tmp/tmp.hash rm -f /tmp/tmp.hash
@@ -88,28 +88,28 @@ HelloWorld.so: lib/lib-efi.a @@ -88,31 +88,31 @@ HelloWorld.so: lib/lib-efi.a
ShimReplace.so: lib/lib-efi.a ShimReplace.so: lib/lib-efi.a
cert-to-efi-sig-list: cert-to-efi-sig-list.o lib/lib.a cert-to-efi-sig-list: cert-to-efi-sig-list.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
sig-list-to-certs: sig-list-to-certs.o lib/lib.a sig-list-to-certs: sig-list-to-certs.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
sign-efi-sig-list: sign-efi-sig-list.o lib/lib.a sign-efi-sig-list: sign-efi-sig-list.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
hash-to-efi-sig-list: hash-to-efi-sig-list.o lib/lib.a hash-to-efi-sig-list: hash-to-efi-sig-list.o lib/lib.a
$(CC) $(ARCH3264) -o $@ $< lib/lib.a - $(CC) $(ARCH3264) -o $@ $< lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) lib/lib.a
cert-to-efi-hash-list: cert-to-efi-hash-list.o lib/lib.a cert-to-efi-hash-list: cert-to-efi-hash-list.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
efi-keytool: efi-keytool.o lib/lib.a efi-keytool: efi-keytool.o lib/lib.a
$(CC) $(ARCH3264) -o $@ $< lib/lib.a - $(CC) $(ARCH3264) -o $@ $< lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) lib/lib.a
efi-readvar: efi-readvar.o lib/lib.a efi-readvar: efi-readvar.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
efi-updatevar: efi-updatevar.o lib/lib.a efi-updatevar: efi-updatevar.o lib/lib.a
- $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a - $(CC) $(ARCH3264) -o $@ $< -lcrypto lib/lib.a
+ $(CC) $(ARCH3264) -o $@ $< $(ldflags_openssl) $(EXTRA_LDFLAGS) -lcrypto lib/lib.a + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) -lcrypto lib/lib.a
flash-var: flash-var.o lib/lib.a flash-var: flash-var.o lib/lib.a
$(CC) $(ARCH3264) -o $@ $< lib/lib.a - $(CC) $(ARCH3264) -o $@ $< lib/lib.a
-- + $(CC) $(ARCH3264) -o $@ $< $(EXTRA_LDFLAGS) lib/lib.a
1.9.1
clean:
rm -f PK.* KEK.* DB.* $(EFIFILES) $(EFISIGNED) $(BINARIES) *.o *.so