Skip to content
Snippets Groups Projects
Verified Commit fe1d22b7 authored by Davide Gardenal's avatar Davide Gardenal
Browse files

default.xml: update upstream revisions and delete ovmf patches


The following patches are now in oe-core so we can delete them:
 - ovmf/0001-edk2-BaseTools-gcc12.patch
 - ovmf/0002-edk2-LZMA-gcc12.patch

openembedded-core update includes:
e63013cc38 gcc: Upgrade to 11.3 release
1887a69a17 rust-common: Fix native signature dependency issues
cf7c1cde3a rust-common: Drop LLVM_TARGET and simplify
a4886f02df rust-common: Fix for target definitions returning 'NoneType' for arm
84e891d812 rust-common: Ensure sstate signatures have correct dependencues for do_rust_gen_targets
424b81ae68 rust-common: Fix sstate signatures between arm hf and non-hf
d28d84c5b4 ovmf: Fix native build with gcc-12
bbb7dcb461 pciutils: avoid lspci conflict with busybox
d96022a389 insane.bbclass: make sure to close .patch files
b34aaa9acb libseccomp: Add missing files for ptests
bd72b15e9a staging.bbclass: process direct dependencies in deterministic order
8d5f5823b3 mesa.inc: package 00-radv-defaults.conf
862c1b109c ncurses: update to patchlevel 20220423
9cf49b4f07 libpcre2: upgrade 10.39 -> 10.40
02982668ac linux-yocto/5.10: update to v5.10.114
7d734c95ba linux-yocto/5.15: update to v5.15.38
96ed22ed1e linux-yocto/5.10: update to v5.10.113
90628b9bbc linux-yocto/5.15: update to v5.15.37
8fd6a9f521 cve-check: Allow warnings to be disabled
726ce5bf1e cve-extra-exclusions: Add kernel CVEs
65498411d7 cve-check: Only include installed packages for rootfs manifest
af227e0c62 cve-check: Add helper for symlink handling
637d6ff44b cve-check.bbclass: Added do_populate_sdk[recrdeptask].
82f4186ec0 libxslt: Mark CVE-2022-29824 as not applying
95f1c5d0bb tiff: Add jbig PACKAGECONFIG and clarify CVE-2022-1210
c703b970f6 vim: Upgrade 8.2.4912 -> 8.2.5034 to fix 9 CVEs

meta-openembedded update includes:
fcc7d7eae python3-matplotlib: add missing dependency
4e66373fe devmem2: the source and patches moved to github repo
17da928a8 python3-speedtest-cli: fix RDEPENDS
18a923d20 sdbus-c++-libsystemd: Fix patch fuzz
99496d2b3 sdbus-c++: Link with libatomic for rv32
9a2029553 sdbus-c++: Link with libatomic on mips/ppc32
16f08eb5a conntrack-tools: fix postinst script
db3a802f8 graphviz: rrecommends on liberation-fonts
79e28d1c8 libportal: add distro features check
442af705f unattended-upgrades: Disable auto-detecting modules
4895c4d65 mariadb: Fix i386 Clang builds
367e8927b mariadb: update to 10.7.4
ff3a018b2 libmtp: Add doxygen-native dependency in case documentation build is enabled in PACKAGECONFIG. This fixes a FTBFS due to missing dependency.
b23cd1031 sdbus-c++-libsystemd: Bump SRCREV to last commit of 250-stable branch
133d2c200 postgresql: upgrade 14.2 -> 14.3
71613a9fa php: upgrade 8.1.5 -> 8.1.6
7566c789d php: upgrade 8.1.4 -> 8.1.5
a104444d2 python3-wxgtk4: backport patch to fix svg issue
2c051c65a jq: Fix typo OE_EXTRACONF -> EXTRA_OECONF
6104aead9 libcamera: fix packaging
0b7836265 bats: upgrade 1.6.0 -> 1.6.1
3a76ff41a conntrack-tools: fix postinst script
8c0dca405 ostree: prevent ostree-native depending on target virtual/kernel to provide kernel-module-overlay
797684d24 bats: Add patch to fix false-negatives caused by teardown code
ab1e20941 imlib2: update SRC_URI
166ef8dbb minidlna: fix obsolete license warning
91bcdd0a7 vboxguestdrivers: upgrade 6.1.32 -> 6.1.34
122685c98 devmem2: update SRC_URI according to redirect
b095a248c devmem2: add support for different page sizes
c8f5b7a27 devmem2: reinstate previous patches, removed by mistake
a6556526d s-nail: Set VAL_MTA
fe57c67d2 openldap: Upgrade 2.5.9 -> 2.5.12
6c63579af openldap: Remove libgcrypt dependency
f2f81539d networkmanager: fix parallel build failure
26f6e6968 meta-gnome: fix layer depends.
94ca14269 python3-wxgtk4: Needs x11 for sip module
204fd35a3 meta-python-image: Fix build depends
aebfc98d8 python3-astroid: upgrade 2.11.2 -> 2.11.3
947ff549c evolution-data-server: Do not pass --library-path to gir compiler
9f4bdefa4 evince: Add dbus to depnedencies on non-x11 builds
35b74d369 makedumpfile: Use right TARGET for ppc32
802b41d21 mimic: Use special rateconv.c license
353934eb6 libcereal: Enable for glibc/ppc
3a34f2f64 ufw: Fix packaging errors found with ppc64
21b475078 conntrack-tools: Fix missing capability
49a170035 frr: inherit autotools-brokensep instead of autotools
99ae5037e meta-oe-image: fix build depends

meta-intel update includes:
8e472da7 openvino-inference-engine: change branch name master -> main
c2e2f371 level-zero: remove devtool comments
db17ad72 onevpl-intel-gpu: remove patch
0683aea4 onevpl-intel-gpu: upgrade 22.1.0 -> 22.3.2
6bd8a1f4 intel-mediasdk: upgrade 22.1.0 -> 22.3.0
0487f539 intel-media-driver: upgrade 22.1.1 -> 22.3.1
dedf1093 libva-intel-utils: upgrade 2.13.0 -> 2.14.0
3936e566 libva-intel: upgrade 2.13.0 -> 2.14.0
dd16e1bf gmmlib: upgrade 22.0.3 -> 22.1.2
bc8899d6 intel-microcode: upgrade 20220419 -> 20220510
f72ea519 maintainers.inc: add missing entry for vc-intrinsics
e533acc2 ipp-crypto-mb: update to latest
97f52272 intel-graphics-compiler: define SRCREV_FORMAT

meta-freescale update includes:
92df6b76 Merge pull request #1097 from Freescale/backport-1096-to-kirkstone
c3bc5edf layer wide: remove lzop dependency dropped upstream

meta-security update includes:
d3d8e62 lib-perl: prefix man pages to avoid conflicting with base perl
b874791 Parsec-service: Update installation procedure
0325071 oeqa/cases/tpm2: fix and enhance test suite
4270d36 tpm2-tools: Add missing rdepends
2f91f34 tpm2-pkcs11: tpm2-pkcs11 module missing
ed75b88 aide: Update 01.17.4
8727b7c aide: Add depend on audit when audit is enabled.
9301e39 fscrypt: add distro_check on pam

meta-arm update includes:
93cf02a kas: corstone1000: drop the use of the FVP script
207f298 kas: corstone1000: set HEADs to kirkstone and drop use of meta-arm-image
fc09cc0 CI: use external-arm-toolchain 10.3
b3c3f77 arm/linux-yocto: fix boot failure in qemuarm64-secureboot
43224b6 arm-bsp/tf-a-tests: Add recipe to build and install TFTF

Signed-off-by: Davide Gardenal's avatarDavide Gardenal <davide.gardenal@huawei.com>
parent 2c67a291
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !135. Comments created here will be created in the context of that merge request.
...@@ -24,18 +24,18 @@ SPDX-FileCopyrightText: Huawei Inc. ...@@ -24,18 +24,18 @@ SPDX-FileCopyrightText: Huawei Inc.
<remote name="seco" fetch="https://git.seco.com" /> <remote name="seco" fetch="https://git.seco.com" />
<project name="bitbake" remote="openembedded" revision="494fcfcb7c4469915c67f544997104d81c417266" path="bitbake" /> <project name="bitbake" remote="openembedded" revision="494fcfcb7c4469915c67f544997104d81c417266" path="bitbake" />
<project name="openembedded-core" remote="openembedded" revision="4eb0b7468383a1d0314b3bfd43ea37c95de464d9" path="oe-core" /> <project name="openembedded-core" remote="openembedded" revision="e63013cc38b82659658365da53b14952711d6701" path="oe-core" />
<project name="meta-openembedded" remote="openembedded" revision="5357c7a40eaf8d1bcf7ff58edbba8e9527e40c7d" path="meta-openembedded" /> <project name="meta-openembedded" remote="openembedded" revision="fcc7d7eae82be4c180f2e8fa3db90a8ab3be07b7" path="meta-openembedded" />
<project name="aehs29/meta-freertos" remote="github" revision="98a6838261d36b8f79c5fbae1736492169727a1e" path="meta-freertos" /> <project name="aehs29/meta-freertos" remote="github" revision="98a6838261d36b8f79c5fbae1736492169727a1e" path="meta-freertos" />
<project name="meta-intel" remote="yocto" revision="fb23bc3e661685383edd3026e21ca25825c48bc4" path="meta-intel" /> <project name="meta-intel" remote="yocto" revision="8e472da759cd5a5bf2ece041d2796db56b1d5482" path="meta-intel" />
<project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" /> <project name="pub/intel/yocto/meta-seco-intel" remote="seco" revision="65a673560211b11986db5785c70254fad190785f" path="meta-seco-intel" />
<project name="meta-freescale" remote="yocto" revision="6f27a6fb2511bc1ac206efe8196f6e73b33b1dce" path="meta-freescale" /> <project name="meta-freescale" remote="yocto" revision="92df6b76f38397b75ea76d588935b5b91b63c58c" path="meta-freescale" />
<project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="b82eaf8b0a2abe775c158b0a069b7bb7894ec8e6" path="meta-seco-imx" /> <project name="pub/i.mx/yocto/5.x/meta-seco-imx" remote="seco" revision="b82eaf8b0a2abe775c158b0a069b7bb7894ec8e6" path="meta-seco-imx" />
<project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" /> <project name="meta-raspberrypi" remote="yocto" revision="0135a02ea577bd39dd552236ead2c5894d89da1d" path="meta-raspberrypi" />
<project name="meta-security" remote="yocto" revision="93f2146211001ee3cf697d8428969cc3069ed6ba" path="meta-security" /> <project name="meta-security" remote="yocto" revision="d3d8e62bf1caa3870a504c0addcfd200b33c189f" path="meta-security" />
<project name="rauc/meta-rauc" remote="github" revision="4429bd1f29677c9a7de032d53240fb4791a41e1f" path="meta-rauc" /> <project name="rauc/meta-rauc" remote="github" revision="4429bd1f29677c9a7de032d53240fb4791a41e1f" path="meta-rauc" />
<project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" /> <project name="riscv/meta-riscv" remote="github" revision="70e099d7ceca52a1dde2c978713012f6b20a9891" path="meta-riscv" />
<project name="meta-arm" remote="yocto" revision="b838d40efe06c839d58cf39b785175d0ba7518c6" path="meta-arm" /> <project name="meta-arm" remote="yocto" revision="93cf02a8213c5e2d2edafbcd47ff571941ad0bcc" path="meta-arm" />
<!-- <!--
All entries above are pinned to a specific revision and updated manually. All entries above are pinned to a specific revision and updated manually.
......
# SPDX-FileCopyrightText: TianoCore and contributors
#
# SPDX-License-Identifier: Apache-2.0
From 7b005f344e533cd913c3ca05b266f9872df886d1 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 24 Mar 2022 20:04:34 +0800
Subject: [PATCH] BaseTools: fix gcc12 warning
GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free]
545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
GenFfs.c:544:5: note: call to ?fclose? here
544 | fclose (InFileHandle);
| ^~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Upstream-Status: Backport [commit 7b005f344e533cd913c3ca05b266f9872df886d1]
---
BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
BaseTools/Source/C/GenSec/GenSec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
index 949025c33325..d78d62ab3689 100644
--- a/BaseTools/Source/C/GenFfs/GenFfs.c
+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
if (PeFileBuffer == NULL) {
fclose (InFileHandle);
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
return EFI_OUT_OF_RESOURCES;
}
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index d54a4f9e0a7d..b1d05367ec0b 100644
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
if (PeFileBuffer == NULL) {
fclose (InFileHandle);
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
return EFI_OUT_OF_RESOURCES;
}
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
# SPDX-FileCopyrightText: TianoCore and contributors
#
# SPDX-License-Identifier: Apache-2.0
From 85021f8cf22d1bd4114803c6c610dea5ef0059f1 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 24 Mar 2022 20:04:35 +0800
Subject: [PATCH] BaseTools: fix gcc12 warning
Sdk/C/LzmaEnc.c: In function ?LzmaEnc_CodeOneMemBlock?:
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*p.rc.outStream? [-Werror=dangling-pointer=]
2828 | p->rc.outStream = &outStream.vt;
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
| ^~~~~~~~~
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ?outStream? in ?*(CLzmaEnc *)pp.rc.outStream? [-Werror=dangling-pointer=]
2828 | p->rc.outStream = &outStream.vt;
| ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
Sdk/C/LzmaEnc.c:2811:28: note: ?outStream? declared here
2811 | CLzmaEnc_SeqOutStreamBuf outStream;
| ^~~~~~~~~
Sdk/C/LzmaEnc.c:2811:28: note: ?pp? declared here
cc1: all warnings being treated as errors
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Upstream-Status: Backport [commit 85021f8cf22d1bd4114803c6c610dea5ef0059f1]
---
BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
index 4e9b499f8d80..4b9f5fa69248 100644
--- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
nowPos64 = p->nowPos64;
RangeEnc_Init(&p->rc);
- p->rc.outStream = &outStream.vt;
if (desiredPackSize == 0)
return SZ_ERROR_OUTPUT_EOF;
+ p->rc.outStream = &outStream.vt;
res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
+ p->rc.outStream = NULL;
*unpackSize = (UInt32)(p->nowPos64 - nowPos64);
*destLen -= outStream.rem;
...@@ -5,7 +5,4 @@ ...@@ -5,7 +5,4 @@
# Backport 3 upstreamed patches to make edk2 work with gcc 12.x # Backport 3 upstreamed patches to make edk2 work with gcc 12.x
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-edk2-BaseTools-gcc12.patch \ SRC_URI += "file://0003-edk2-DevicePath-gcc12-workaround.patch"
file://0002-edk2-LZMA-gcc12.patch \
file://0003-edk2-DevicePath-gcc12-workaround.patch \
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment