summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-core/ovmf
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:13:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commitc182c62dd929fe69b57a12bc04099fcd09b5d436 (patch)
treea34e6d5c7dc6d91fc51f43b738099b458764e165 /poky/meta/recipes-core/ovmf
parent7f40b7168b897da48694d6e71fd3fd45861bfb19 (diff)
downloadopenbmc-c182c62dd929fe69b57a12bc04099fcd09b5d436.tar.xz
poky: subtree update:b5763b2f48..f468a73523
Adrian Bunk (13): iproute2: Remove -fcommon libxcrypt2: Remove -fcommon xorg-xserver: Remove -fcommon mesa: Remove -fcommon at-spi2-atk: Remove -fcommon menu-cache: Replace -fcommon with fix matchbox-wm: Replace -fcommon with fix llvm: Remove -fcommon vte: Remove workaround for gcc 4.8 python-numpy: Remove workaround for host gcc < 5 libtasn1: Remove workaround for host gcc < 5 nettle: Remove workaround for gcc < 5 wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Alejandro Hernandez (1): connman: Include vpn-script in FILES Alexander Kanavin (30): libinput: add ptest libinput: update 1.15.2 -> 1.15.5 avahi: merge avahi-ui into the main recipe avahi: update to 0.8 testsdkext/devtool: initialize the test component's git repo git: update to 2.26.2 libcap: update to 2.33 libhandy: add a recipe from meta-oe libdazzle: update to 3.36.0 epiphany: update to 3.36.1 patchelf: switch to git powertop: switch to Arjan's git meson: fix upstream version check rpcsvc-proto: update to 1.4.1 vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-demos: upgrade to latest revision e2fsprogs: update to 1.45.6 build-compare: update to latest revision ovmf: update to 202002 cdrtools-native: fix upstream version check re2c: correct upstream location vte: add icu dependency mesa: enable x11 for native/nativesdk runqemu: set host DRI driver path for all instances of virgl usage libepoxy: do not strip RUNPATH from native/nativesdk virgl: skip test on Debian 9 runqemu: force software x11 renderer for SDL when GL is not in use gcr: correct a build race between vapi files Andrej Valek (1): icu: upgrade 66.1 -> 67.1 Anton Eliasson (1): meson.bbclass: Close the log file after reading Bartosz Golaszewski (1): busybox: disable i2ctransfer Changqing Li (2): rpm: fix file conflicts for MIPS64 N32 lib/oe/package_manager: update default rpm config %_prefer_color Jacob Kroon (1): pseudo: Fix enum typedef Joe Slater (1): wget: improve reproducible build Joshua Watt (3): libnewt: Backport patch to fix reproducibility bitbake.conf: Prevent git from detecting parent repo in recipe classes/kernel: Generate reproducible kernel module tarball Kai Kang (1): python3-git: 3.0.5 -> 3.1.2 Khem Raj (9): avahi: Cover gtk packageconfig with x11/wayland distro features tunes: Add new tune files for cortexa55 and cortexa73-cortexa53 gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs gcc10: Update to GCC 10.1 Release glibc: Update to latest on 2.31 branch gcc10: Default back to -fcommon gcc10: Revert using __getauxval in libgcc glib-2.0: Fix stpcpy detection for mingw wayland: fix condition for strndup detection Konrad Weihmann (2): pypi.bbclass: mind package suffix on version check file: add PACKAGECONFIG for auto options Mingli Yu (1): python3-setuptools: add the missing rdepends Peter Kjellerstedt (2): sstate.bbclass: Do not fail if files cannot be touched file: Remove unneccessary override of PACKAGECONFIG for native Pierre-Jean Texier (1): sysklogd: upgrade 2.1.1 -> 2.1.2 Richard Leitner (6): gdbm: add patch to fix link failure against gcc 10 dtc: update to 1.6.0 libtirpc: remove extra "-fcommon" from CFLAGS libcomps: update to 0.1.15 binutils: add patch to fix issues with gcc 10 cpio: add patch to fix issues with gcc 10 Richard Purdie (4): recipes: Remove remaining INC_PR variables insane: Promote warnings into errors poky: We now match OE-Core's error/warning config so simplify poky.conf: Post release version bump Robert P. J. Day (1): documentation.conf: Add variables supported by features_check.bbclass Tim Orling (1): pypi.bbclass: use new pypi UPSTREAM_CHECK_URI Wang Mingyu (1): nettle: upgrade 3.5.1 -> 3.6 Yeoh Ee Peng (1): selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS Yi Zhao (1): opkg-keyrings: check if opkg-key exists before run postinst Zoltan Boszormenyi (4): libva: Factor out base parts into an include file libva-initial: New bootstrap recipe mesa: Add PACKAGECONFIG knob to enable VAAPI mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers jan (1): scripts/tiny/ksize: Fix for more recent kernels wenlin.kang@windriver.com (1): populate_sdk_base.bbclass: fix warning: name not matched Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-core/ovmf')
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch (renamed from poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch)16
-rw-r--r--poky/meta/recipes-core/ovmf/ovmf_git.bb8
2 files changed, 12 insertions, 12 deletions
diff --git a/poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch b/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch
index c10a39d95..1d4273cdc 100644
--- a/poky/meta/recipes-core/ovmf/ovmf/0004-ovmf-Update-to-latest.patch
+++ b/poky/meta/recipes-core/ovmf/ovmf/0001-ovmf-Update-to-latest.patch
@@ -1,7 +1,7 @@
-From 94eff316b31b4d0348af28c77be5c00bc09fe8e7 Mon Sep 17 00:00:00 2001
+From 640a634936ba8eca4778470fb14c6eb9cfd19953 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Sat, 10 Jun 2017 01:39:36 -0700
-Subject: [PATCH 4/5] ovmf: Update to latest
+Subject: [PATCH 1/2] ovmf: Update to latest
Description: pass -fno-stack-protector to all GCC toolchains
The upstream build rules inexplicably pass -fno-stack-protector only
@@ -15,12 +15,12 @@ Upstream-Status: Pending
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index ca0b122dbb..b0066c2ab8 100755
+index 2b17d3b297..4cd2567c2a 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
-@@ -1941,10 +1941,10 @@ DEFINE GCC_X64_RC_FLAGS = -I binary -O elf64-x86-64 -B i386
- DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii
- DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii
+@@ -1950,10 +1950,10 @@ DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64
+ # GCC Build Flag for included header file list generation
+ DEFINE GCC_DEPS_FLAGS = -MMD -MF $@.deps
-DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
+DEFINE GCC48_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings
@@ -32,7 +32,7 @@ index ca0b122dbb..b0066c2ab8 100755
DEFINE GCC48_IA32_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable
DEFINE GCC48_IA32_X64_DLINK_FLAGS = DEF(GCC48_IA32_X64_DLINK_COMMON) -Wl,--entry,$(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Wl,-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map,--whole-archive
DEFINE GCC48_IA32_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x220 DEF(GCC_DLINK2_FLAGS_COMMON)
-@@ -1953,7 +1953,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
+@@ -1962,7 +1962,7 @@ DEFINE GCC48_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x228 DEF
DEFINE GCC48_ASM_FLAGS = DEF(GCC_ASM_FLAGS)
DEFINE GCC48_ARM_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
DEFINE GCC48_AARCH64_ASM_FLAGS = $(ARCHASM_FLAGS) $(PLATFORM_FLAGS) DEF(GCC_ASM_FLAGS) -mlittle-endian
@@ -42,5 +42,5 @@ index ca0b122dbb..b0066c2ab8 100755
DEFINE GCC48_AARCH64_CC_FLAGS = $(ARCHCC_FLAGS) $(PLATFORM_FLAGS) -mcmodel=large DEF(GCC_AARCH64_CC_FLAGS)
DEFINE GCC48_AARCH64_CC_XIPFLAGS = DEF(GCC_AARCH64_CC_XIPFLAGS)
--
-2.17.1
+2.24.0
diff --git a/poky/meta/recipes-core/ovmf/ovmf_git.bb b/poky/meta/recipes-core/ovmf/ovmf_git.bb
index 9667fa0c8..c08962782 100644
--- a/poky/meta/recipes-core/ovmf/ovmf_git.bb
+++ b/poky/meta/recipes-core/ovmf/ovmf_git.bb
@@ -12,15 +12,15 @@ LIC_FILES_CHKSUM = "file://OvmfPkg/License.txt;md5=06357ddc23f46577c2aeaeaf7b776
PACKAGECONFIG ??= ""
PACKAGECONFIG[secureboot] = ",,,"
-SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=git \
+SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
file://0001-ovmf-update-path-to-native-BaseTools.patch \
file://0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \
file://0003-ovmf-enable-long-path-file.patch \
- file://0004-ovmf-Update-to-latest.patch \
+ file://0001-ovmf-Update-to-latest.patch \
"
-PV = "edk2-stable201911"
-SRCREV = "bd85bf54c268204c7a698a96f3ccd96cd77952cd"
+PV = "edk2-stable202002"
+SRCREV = "4c0f6e349d32cf27a7104ddd3e729d6ebc88ea70"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
inherit deploy