Skip to contentSkip to conversation

ovmf: upgrade 202111 -> 202202

PATCH New Wang Mingyu 2 participants 5 messages Mar 1, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ovmf: upgrade 202111 -> 202202

0001-Fix-VLA-parameter-warning.patch
removed since it's included in 202202

Changelog:
=========
OvmfPkg Add new target for Cloud Hypervisor
Add TDVF to OvmfPkg
Add new APIs to UefiCpuPkg/UefiCpuLib
Add AMD Secure Nested Paging Support
Add SSDT PCI generator in DynamicTablesPkg
Support ACPI 6.4 PPTT changes
Add FdtHwInfoParser library
Add DynamicPlatRepo library
Make package and platform builds reproducible across source format changes Add Uncrustify CI Plugin
Apply uncrustify changes to all package C and H files

---
 .../ovmf/0001-Fix-VLA-parameter-warning.patch | 51 -------------------
 meta/recipes-core/ovmf/ovmf_git.bb            |  5 +-
 2 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-Fix-VLA-parameter-warning.patch
meta/recipes-core/ovmf/ovmf/0001-Fix-VLA-parameter-warning.patch deleted +0 -51
deleted file mode 100644
index d658123b81..0000000000
@@ -1,51 +0,0 @@
-From 498627ebda6271b59920f43a0b9b6187edeb7b09 Mon Sep 17 00:00:00 2001
-From: Adrian Herrera <[email protected]>
-Date: Mon, 22 Mar 2021 21:06:47 +0000
-Subject: [PATCH] Fix VLA parameter warning
-
-Make VLA buffer types consistent in declarations and definitions.
-Resolves build crash when using -Werror due to "vla-parameter" warning.
-
-Upstream-Status: Submitted [https://github.com/google/brotli/pull/893]
-Signed-off-by: Adrian Herrera <[email protected]>
----
- c/dec/decode.c | 6 ++++--
- c/enc/encode.c | 5 +++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
-index 114c505..bb6f1ab 100644
---- a/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
-+++ b/BaseTools/Source/C/BrotliCompress/brotli/c/dec/decode.c
-@@ -2030,8 +2030,10 @@ static BROTLI_NOINLINE BrotliDecoderErrorCode SafeProcessCommands(
- }
- 
- BrotliDecoderResult BrotliDecoderDecompress(
--    size_t encoded_size, const uint8_t* encoded_buffer, size_t* decoded_size,
--    uint8_t* decoded_buffer) {
-+    size_t encoded_size,
-+    const uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(encoded_size)],
-+    size_t* decoded_size,
-+    uint8_t decoded_buffer[BROTLI_ARRAY_PARAM(*decoded_size)]) {
-   BrotliDecoderState s;
-   BrotliDecoderResult result;
-   size_t total_out = 0;
-diff --git a/c/enc/encode.c b/c/enc/encode.c
-index 68548ef..ab0a490 100644
---- a/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
-+++ c/BaseTools/Source/C/BrotliCompress/brotli/c/enc/encode.c
-@@ -1470,8 +1470,9 @@ static size_t MakeUncompressedStream(
- 
- BROTLI_BOOL BrotliEncoderCompress(
-     int quality, int lgwin, BrotliEncoderMode mode, size_t input_size,
--    const uint8_t* input_buffer, size_t* encoded_size,
--    uint8_t* encoded_buffer) {
-+    const uint8_t input_buffer[BROTLI_ARRAY_PARAM(input_size)],
-+    size_t* encoded_size,
-+    uint8_t encoded_buffer[BROTLI_ARRAY_PARAM(*encoded_size)]) {
-   BrotliEncoderState* s;
-   size_t out_size = *encoded_size;
-   const uint8_t* input_start = input_buffer;
--- 
-2.31.1
-
meta/recipes-core/ovmf/ovmf_git.bb +2 -3
index 9db1514acc..b15d40eac8 100644
@@ -21,11 +21,10 @@ SRC_URI = "gitsm://github.com/tianocore/edk2.git;branch=master;protocol=https \
            file://0003-ovmf-Update-to-latest.patch \
            file://0005-debug-prefix-map.patch \
            file://0006-reproducible.patch \
-           file://0001-Fix-VLA-parameter-warning.patch \
            "
 
-PV = "edk2-stable202111"
-SRCREV = "bb1bba3d776733c41dbfa2d1dc0fe234819a79f2"
+PV = "edk2-stable202202"
+SRCREV = "b24306f15daa2ff8510b06702114724b33895d3c"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>edk2-stable.*)"
 
 inherit deploy
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 sqlite3: upgrade 3.37.2 -> 3.38.0

Remove invalid PACKAGECONFIG : json1

---
 meta/recipes-support/sqlite/sqlite3.inc                        | 3 +--
 .../sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb}            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} (86%)
meta/recipes-support/sqlite/sqlite3.inc +1 -2
index aa5dc0974b..b89f509c12 100644
@@ -23,7 +23,7 @@ CVE_PRODUCT = "sqlite"
 inherit autotools pkgconfig siteinfo
 
 # enable those which are enabled by default in configure
-PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext"
+PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext"
 PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext"
 
 PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit"
@@ -31,7 +31,6 @@ PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses
 PACKAGECONFIG[fts3] = "--enable-fts3,--disable-fts3"
 PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4"
 PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5"
-PACKAGECONFIG[json1] = "--enable-json1,--disable-json1"
 PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree"
 PACKAGECONFIG[session] = "--enable-session,--disable-session"
 PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions"
meta/recipes-support/sqlite/sqlite3_3.38.0.bb renamed from meta/recipes-support/sqlite/sqlite3_3.37.2.bb +1 -1
similarity index 86%
rename from meta/recipes-support/sqlite/sqlite3_3.37.2.bb
rename to meta/recipes-support/sqlite/sqlite3_3.38.0.bb
index eb684e0d14..a797679f12 100644
@@ -4,7 +4,7 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
 
 SRC_URI = "http://www.sqlite.org/2022/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-SRC_URI[sha256sum] = "4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8"
+SRC_URI[sha256sum] = "1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68"
 
 # -19242 is only an issue in specific development branch commits
 CVE_CHECK_IGNORE += "CVE-2019-19242"
Signature · 1 line
2.25.1
#2 lore raw

Re: [OE-core] [PATCH] sqlite3: upgrade 3.37.2 -> 3.38.0

Quoted 14 lines · wangmy

Remove invalid PACKAGECONFIG : json1

---
 meta/recipes-support/sqlite/sqlite3.inc                        | 3 +--
 .../sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb}            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3.37.2.bb => sqlite3_3.38.0.bb} (86%)
meta/recipes-support/sqlite/sqlite3.inc +0 -0
index aa5dc0974b..b89f509c12 100644

meta/recipes-support/sqlite/sqlite3.inc CVE_PRODUCT = "sqlite" · line 29

Quoted 8 lines
meta/recipes-support/sqlite/sqlite3.inc +1 -1
@@ -23,7 +23,7 @@ CVE_PRODUCT = "sqlite"
 inherit autotools pkgconfig siteinfo
 
 # enable those which are enabled by default in configure
-PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext"
+PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext"
 PACKAGECONFIG:class-native ?= "fts4 fts5 json1 rtree dyn_ext"
 
 PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit"

This triggers:

WARNING: sqlite3-native-3_3.38.0-r0 do_configure: QA Issue: sqlite3-native: invalid PACKAGECONFIG: json1 [invalid-packageconfig]

but I fixed the patch in master-next.

Cheers,

Richard

#3 lore raw

PATCH 1/1 sysstat: upgrade 12.4.4 -> 12.4.5

In reply to Wang Mingyu

Changelog:
=========
* sar/sadf: Make sure that datafiles with unknown activities can be read by sar and sadf.
* sar/sadf: Don't reallocate buffers for activities not present in file.
* sar: Make sure that all buffers are copied in copy_structures() function.

---
 .../sysstat/{sysstat_12.4.4.bb => sysstat_12.4.5.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/sysstat/{sysstat_12.4.4.bb => sysstat_12.4.5.bb} (65%)
meta/recipes-extended/sysstat/sysstat_12.4.5.bb renamed from meta/recipes-extended/sysstat/sysstat_12.4.4.bb +1 -1
similarity index 65%
rename from meta/recipes-extended/sysstat/sysstat_12.4.4.bb
rename to meta/recipes-extended/sysstat/sysstat_12.4.5.bb
index d635650a1f..fe3db4d8a5 100644
@@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch"
 
-SRC_URI[sha256sum] = "9512e7479e04f92e251c5c6b4bd94b8f643d212bd0e986a8ea4d147a6e943d24"
+SRC_URI[sha256sum] = "ef445acea301bbb996e410842f6290a8d049e884d4868cfef7e85dc04b7eee5b"
Signature · 1 line
2.25.1
#4 lore raw

PATCH 1/1 wget: upgrade 1.21.2 -> 1.21.3

In reply to Wang Mingyu

Changelog:
=========
** Fix computation of total bytes downloaded during FTP trasnfers (#61277) ** Add option to select TLS 1.3 on the command line
** Fix HSTS build issues on some 64-bit big-endian systems
** Hide password during status report in --no-verbose
** Remove a sprurious print statement that showed up even during --quiet ** Some more cleanups and bug-fixes

---
 meta/recipes-extended/wget/{wget_1.21.2.bb => wget_1.21.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/wget/{wget_1.21.2.bb => wget_1.21.3.bb} (60%)
meta/recipes-extended/wget/wget_1.21.3.bb renamed from meta/recipes-extended/wget/wget_1.21.2.bb +1 -1
similarity index 60%
rename from meta/recipes-extended/wget/wget_1.21.2.bb
rename to meta/recipes-extended/wget/wget_1.21.3.bb
index 90f3eb104d..f176a1546c 100644
@@ -2,6 +2,6 @@ SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
            file://0002-improve-reproducibility.patch \
           "
 
-SRC_URI[sha256sum] = "e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497"
+SRC_URI[sha256sum] = "5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5"
 
 require wget.inc
Signature · 1 line
2.25.1