diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch')
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch b/poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch deleted file mode 100644 index da7e27c64..000000000 --- a/poky/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5c2e24a9ed54dfee77d1844a080e998b4affe916 Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt <xypron.glpk@gmx.de> -Date: Sat, 2 Jun 2018 19:00:41 +0200 -Subject: [PATCH] efi_loader: avoid make race condition - -When U-Boot is built with 'make -j' there is not guarantee that targets in -directory arch/ are built before targets in directory lib/. The current -build instruction for EFI binaries in lib/ rely on dependencies in arch/. -If $(EFI_CRT0) or $(EFI_RELOC) is not yet built before trying to build -%.efi an error - *** No rule to make target '%.efi' -occurs. - -With the patch separate copies of $(EFI_CRT0) and $(EFI_RELOC) named -efi_crt0.o and efi_reloc.o are built in lib/efi_loader and -lib/efi_selftest. - -Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> -Signed-off-by: Alexander Graf <agraf@suse.de> - -Upstream-Status: Backport from 2018.07 - -Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> ---- - scripts/Makefile.lib | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 8f19b2db56..f2f398c935 100644 ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -404,8 +404,14 @@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ - - EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) - --$(obj)/%_efi.so: $(obj)/%.o arch/$(ARCH)/lib/$(EFI_CRT0) \ -- arch/$(ARCH)/lib/$(EFI_RELOC) -+$(obj)/efi_crt0.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_CRT0:.o=.S) -+ $(call if_changed_dep,as_o_S) -+ -+$(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcount_source) FORCE -+ $(call cmd,force_checksrc) -+ $(call if_changed_rule,cc_o_c) -+ -+$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o - $(call cmd,efi_ld) - - # ACPI --- -2.17.1 - |