subtree updates
meta-raspberrypi: cfbb192e5c..83f5577d8d:
AJ Bagwell (1):
linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR
poky: ed98f1a1ae..30b38d9cb9:
Alexander Kanavin (1):
connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific
Chen Qi (1):
spirv-tools: fix to use sdk-1.3.204 branch
Kevin Hao (1):
kernel.bbclass: Fix the do_strip() malfunction
Khem Raj (2):
libarchive: Upgrade to 3.6.1
musl: Move to 1.2.3 release tag
Martin Jansa (1):
license_image.bbclass: close package.manifest file
Ralph Siemsen (2):
xz: fix CVE-2022-1271
gzip: upgrade 1.11 -> 1.12
Richard Purdie (2):
uninative: Upgrade to 3.6 with gcc 12 support
package_ipk/deb: Fix specific version handling
Ross Burton (1):
python3-cryptography: backport fix for leaky test
meta-openembedded: b9e440ead8..1888971b1f:
Andreas Müller (5):
octave: add PACKAGECONFIG for (Qt-)gui - disabled by default
xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0
gnome-online-accounts: upgrade 3.43.1 -> 3.44.0
mutter: upgrade 41.2 -> 42.0
gnome-shell: upgrade 41.2 -> 42.0
Clément Péron (1):
grpc: remove unused patches
Kai Kang (2):
wxwidgets: fix wx-config multilib issue
python3-wxgtk4: pass '--baselib' to WX_CONFIG
Khem Raj (6):
Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1"
libotr: Include missing sys/socket.h header
libcereal: Link in libatomic on rv32 for ptests
gnuplot: Disable libcerf and fix typo
libcereal: Disable on ppc/ppc64
evolution-data-server: Disable g-i on musl
Markus Volk (1):
gparted: update to v1.4.0
Naveen Saini (1):
ndctl: fix build failure with EXEWRAPPER_ENABLED False
Oleksandr Kravchuk (27):
python3-beautifulsoup: update to 4.11.1
python3-bidict: update to 0.22.0
python3-can: update t 4.0.0
python3-elementpath: update to 2.5.0
python3-flask-login: update to 0.6.0
python3-flask: update to 2.1.1
python3-gcovr: update to 5.1
python3-google-api-core: update to 2.7.1
python3-google-auth: update to 2.6.3
python3-grpcio-tools: update to 1.45.0
python3-ipython: update to 8.2.0
python3-jmespath: update to 1.0.0
python3-mypy: update to 0.942
python3-pint: update to 0.19.1
python3-portalocker: update to 2.4.0
python3-pulsectl: update to 22.3.2
python3-pycurl: update to 7.45.1
python3-pymogo: update to 4.1.0
python3-pyscaffold: update to 4.2.1
python3-pytest-helpers-namespace: update to 2021.12.29
python3-pywbem: update to 1.4.1
python3-regex: update to 2022.3.15
python3-sympy: update to 1.10.1
python3-tqdm: update to 4.64.1
python3-twitter: update to 4.8.0
python3-xmlschema: update to 1.10.0
python3-zeroconf: update to 0.38.4
Robert Yang (1):
python3-wxgtk4: Require DISTRO_FEATURES as gtk3
Sakib Sajal (1):
drbd-utils: update 9.13.1 -> 9.20.2
Scott Murray (1):
wxwidgets: Fix building without x11
Stefan Herbrechtsmeier (2):
grpc: add cmake support for target
grpc: remove useless link with libatomic append
Stefan Schmidt (4):
ot-br-posix: add recipe for an OpenThread Border Router
ot-daemon: add recipe for OpenThread daemon
wpantund: add new recipe
MAINTAINERS: add entry for OpenThread
Willy Tu (1):
googletests: Update SRC_URI to 9e71237 to move closer to lastest version
Yi Zhao (1):
libyang: do not inherit binconfig-disabled
wangmy (9):
haveged: upgrade 1.9.17 -> 1.9.18
hidapi: upgrade 0.10.1 -> 0.11.2
hwdata: upgrade 0.357 -> 0.358
broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3
byacc: upgrade 20211224 -> 20220128
ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0
feh: upgrade 3.6.1 -> 3.8
fio: upgrade 3.29 -> 3.30
grpc: upgrade 1.45.1 -> 1.45.2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8
diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass
index 7ca847f..bc52419 100644
--- a/poky/meta/classes/kernel.bbclass
+++ b/poky/meta/classes/kernel.bbclass
@@ -711,7 +711,7 @@
extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS')
kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux"
- if (extra_sections and kernel_image.find('${KERNEL_IMAGEDEST}/vmlinux') != -1):
+ if (extra_sections and kernel_image.find(d.getVar('KERNEL_IMAGEDEST') + '/vmlinux') != -1):
kernel_image_stripped = kernel_image + ".stripped"
shutil.copy2(kernel_image, kernel_image_stripped)
oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections))
diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass
index 0a5ea0a..7e1d0e0 100644
--- a/poky/meta/classes/license_image.bbclass
+++ b/poky/meta/classes/license_image.bbclass
@@ -19,8 +19,8 @@
pkgs = image_list_installed_packages(d)
output = format_pkg_list(pkgs)
- open(os.path.join(license_image_dir, 'package.manifest'),
- 'w+').write(output)
+ with open(os.path.join(license_image_dir, 'package.manifest'), "w+") as package_manifest:
+ package_manifest.write(output)
}
python license_create_manifest() {
diff --git a/poky/meta/classes/package_deb.bbclass b/poky/meta/classes/package_deb.bbclass
index 2e75e22..a9b8ba0 100644
--- a/poky/meta/classes/package_deb.bbclass
+++ b/poky/meta/classes/package_deb.bbclass
@@ -182,7 +182,8 @@
# '<' = less or equal
# '>' = greater or equal
# adjust these to the '<<' and '>>' equivalents
- #
+ # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0
+ # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0"
for dep in list(var.keys()):
if '(' in dep or '/' in dep:
newdep = re.sub(r'[(:)/]', '__', dep)
@@ -197,6 +198,10 @@
var[dep][i] = var[dep][i].replace("< ", "<< ")
elif (v or "").startswith("> "):
var[dep][i] = var[dep][i].replace("> ", ">> ")
+ elif (v or "").startswith("= ") and "-r" not in v:
+ ver = var[dep][i].replace("= ", "")
+ var[dep][i] = var[dep][i].replace("= ", ">= ")
+ var[dep].append("<< " + ver + ".0")
rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "")
debian_cmp_remap(rdepends)
diff --git a/poky/meta/classes/package_ipk.bbclass b/poky/meta/classes/package_ipk.bbclass
index f67cb0e..9fe3c52 100644
--- a/poky/meta/classes/package_ipk.bbclass
+++ b/poky/meta/classes/package_ipk.bbclass
@@ -168,13 +168,18 @@
# '<' = less or equal
# '>' = greater or equal
# adjust these to the '<<' and '>>' equivalents
- #
+ # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0
+ # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0"
for dep in var:
for i, v in enumerate(var[dep]):
if (v or "").startswith("< "):
var[dep][i] = var[dep][i].replace("< ", "<< ")
elif (v or "").startswith("> "):
var[dep][i] = var[dep][i].replace("> ", ">> ")
+ elif (v or "").startswith("= ") and "-r" not in v:
+ ver = var[dep][i].replace("= ", "")
+ var[dep][i] = var[dep][i].replace("= ", ">= ")
+ var[dep].append("<< " + ver + ".0")
rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "")
debian_cmp_remap(rdepends)
diff --git a/poky/meta/conf/distro/include/yocto-uninative.inc b/poky/meta/conf/distro/include/yocto-uninative.inc
index bfe05ce..411fe45 100644
--- a/poky/meta/conf/distro/include/yocto-uninative.inc
+++ b/poky/meta/conf/distro/include/yocto-uninative.inc
@@ -7,9 +7,9 @@
#
UNINATIVE_MAXGLIBCVERSION = "2.35"
-UNINATIVE_VERSION = "3.5"
+UNINATIVE_VERSION = "3.6"
UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/"
-UNINATIVE_CHECKSUM[aarch64] ?= "6de0771bd21e0fcb5e80388e5b561a8023b24083bcbf46e056a089982aff75d7"
-UNINATIVE_CHECKSUM[i686] ?= "8c8745becbfa1c341bae839c7eab56ddf17ce36c303bcd73d3b2f2f788b631c2"
-UNINATIVE_CHECKSUM[x86_64] ?= "e8047a5748e6f266165da141eb6d08b23674f30e477b0e5505b6403d50fbc4b2"
+UNINATIVE_CHECKSUM[aarch64] ?= "d64831cf2792c8e470c2e42230660e1a8e5de56a579cdd59978791f663c2f3ed"
+UNINATIVE_CHECKSUM[i686] ?= "2f0ee9b66b1bb2c85e2b592fb3c9c7f5d77399fa638d74961330cdb8de34ca3b"
+UNINATIVE_CHECKSUM[x86_64] ?= "9bfc4c970495b3716b2f9e52c4df9f968c02463a9a95000f6657fbc3fde1f098"
diff --git a/poky/meta/recipes-connectivity/connman/connman-conf.bb b/poky/meta/recipes-connectivity/connman/connman-conf.bb
index 6b9207c..7959ed8 100644
--- a/poky/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/poky/meta/recipes-connectivity/connman/connman-conf.bb
@@ -6,6 +6,9 @@
PR = "r2"
+SRC_URI = "file://main.conf \
+ "
+
S = "${WORKDIR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -14,6 +17,6 @@
# Kernel IP-Config is perfectly capable of setting up networking passed in via ip=
do_install:append:qemuall() {
- mkdir -p ${D}${sysconfdir}/default
- echo "export EXTRA_PARAM=\"-I eth0\"" > ${D}${sysconfdir}/default/connman
+ mkdir -p ${D}${sysconfdir}/connman
+ cp ${S}/main.conf ${D}${sysconfdir}/connman/main.conf
}
diff --git a/poky/meta/recipes-connectivity/connman/connman-conf/main.conf b/poky/meta/recipes-connectivity/connman/connman-conf/main.conf
new file mode 100644
index 0000000..a394e8f
--- /dev/null
+++ b/poky/meta/recipes-connectivity/connman/connman-conf/main.conf
@@ -0,0 +1,2 @@
+[General]
+NetworkInterfaceBlacklist = eth0
diff --git a/poky/meta/recipes-core/musl/musl_git.bb b/poky/meta/recipes-core/musl/musl_git.bb
index d290971..044ed9c 100644
--- a/poky/meta/recipes-core/musl/musl_git.bb
+++ b/poky/meta/recipes-core/musl/musl_git.bb
@@ -4,9 +4,9 @@
require musl.inc
inherit linuxloader
-SRCREV = "6d8a515796270eb6cec8a278cb353a078a10f09a"
+SRCREV = "7a43f6fea9081bdd53d8a11cef9e9fab0348c53d"
-BASEVER = "1.2.2"
+BASEVER = "1.2.3"
PV = "${BASEVER}+git${SRCPV}"
diff --git a/poky/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch b/poky/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch
new file mode 100644
index 0000000..904984f
--- /dev/null
+++ b/poky/meta/recipes-devtools/python/python3-cryptography/fix-leak-metric.patch
@@ -0,0 +1,36 @@
+Trigger hashlib initialisation so that the test_create_certificate_with_extensions
+test doesn't fail.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+From dc989d563ab6a078651160e5e6d4ee3df8cb08d7 Mon Sep 17 00:00:00 2001
+From: Alex Gaynor <alex.gaynor@gmail.com>
+Date: Thu, 7 Apr 2022 03:15:09 -0400
+Subject: [PATCH] Added Ubuntu Jammy to CI (#7047)
+
+* Added Ubuntu Jammy to CI
+
+* try thing
+---
+ .github/workflows/ci.yml | 1 +
+ docs/installation.rst | 2 +-
+ tests/hazmat/backends/test_openssl_memleak.py | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tests/hazmat/backends/test_openssl_memleak.py b/tests/hazmat/backends/test_openssl_memleak.py
+index 835c9256a6..2605566bd5 100644
+--- a/tests/hazmat/backends/test_openssl_memleak.py
++++ b/tests/hazmat/backends/test_openssl_memleak.py
+@@ -82,8 +82,11 @@ def free(ptr, path, line):
+ assert result == 1
+
+ # Trigger a bunch of initialization stuff.
++ import hashlib
+ from cryptography.hazmat.backends.openssl.backend import backend
+
++ hashlib.sha256()
++
+ start_heap = set(heap)
+
+ try:
diff --git a/poky/meta/recipes-devtools/python/python3-cryptography/skip-leaky-test.patch b/poky/meta/recipes-devtools/python/python3-cryptography/skip-leaky-test.patch
deleted file mode 100644
index 64248d5..0000000
--- a/poky/meta/recipes-devtools/python/python3-cryptography/skip-leaky-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Mark as test as expected-failure, OpenSSL is leaking memory.
-
-xfail not skip so we can remove this when OpenSSL doesn't leak anymore.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/tests/hazmat/backends/test_openssl_memleak.py b/tests/hazmat/backends/test_openssl_memleak.py
-index 835c9256..639f6ba2 100644
---- a/tests/hazmat/backends/test_openssl_memleak.py
-+++ b/tests/hazmat/backends/test_openssl_memleak.py
-@@ -466,6 +466,7 @@ class TestOpenSSLMemoryLeaks:
- )
- )
-
-+ @pytest.mark.xfail(reason="has memory leaks")
- def test_create_certificate_with_extensions(self):
- assert_no_memory_leaks(
- textwrap.dedent(
diff --git a/poky/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb b/poky/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb
index cb3acdf..9ef5ff3 100644
--- a/poky/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb
+++ b/poky/meta/recipes-devtools/python/python3-cryptography_36.0.2.bb
@@ -16,7 +16,7 @@
file://check-memfree.py \
file://0001-Cargo.toml-specify-pem-version.patch \
file://0002-Cargo.toml-edition-2018-2021.patch \
- file://skip-leaky-test.patch \
+ file://fix-leak-metric.patch \
"
inherit pypi python_setuptools3_rust
diff --git a/poky/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch b/poky/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
similarity index 79%
rename from poky/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch
rename to poky/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
index 7c37bc8..7f9e249 100644
--- a/poky/meta/recipes-extended/gzip/gzip-1.11/wrong-path-fix.patch
+++ b/poky/meta/recipes-extended/gzip/gzip-1.12/wrong-path-fix.patch
@@ -18,19 +18,19 @@
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index d4ecc3f..e4657d2 100644
+index 4f51b61..80a5ddf 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -82,8 +82,7 @@ SUFFIXES = .in
+@@ -93,8 +93,7 @@ SUFFIXES = .in
.in:
$(AM_V_GEN)rm -f $@-t $@ \
- && sed \
+ && sed \
- -e 's|/bin/sh|$(SHELL)|g' \
- -e 's|[@]GREP@|$(GREP)|g' \
+ -e 's|[@]GREP@|$(base_bindir)/grep|g' \
- -e 's|[@]VERSION@|$(VERSION)|g' \
- $(srcdir)/$@.in >$@-t \
- && chmod a=rx $@-t \
---
+ -e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
+ -e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \
+ -e "s|'zgrep'|$(ZGREP_TRANSFORMED)|g" \
+--
2.7.4
diff --git a/poky/meta/recipes-extended/gzip/gzip_1.11.bb b/poky/meta/recipes-extended/gzip/gzip_1.12.bb
similarity index 94%
rename from poky/meta/recipes-extended/gzip/gzip_1.11.bb
rename to poky/meta/recipes-extended/gzip/gzip_1.12.bb
index 321c9c3..14de50b 100644
--- a/poky/meta/recipes-extended/gzip/gzip_1.11.bb
+++ b/poky/meta/recipes-extended/gzip/gzip_1.12.bb
@@ -38,4 +38,4 @@
${B}/tests/Makefile > ${D}${PTEST_PATH}/src/tests/Makefile
}
-SRC_URI[sha256sum] = "3e8a0e0c45bad3009341dce17d71536c4c655d9313039021ce7554a26cd50ed9"
+SRC_URI[sha256sum] = "5b4fb14d38314e09f2fc8a1c510e7cd540a3ea0e3eb9b0420046b82c3bf41085"
diff --git a/poky/meta/recipes-extended/libarchive/libarchive_3.6.0.bb b/poky/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
similarity index 95%
rename from poky/meta/recipes-extended/libarchive/libarchive_3.6.0.bb
rename to poky/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
index f078c8a..c795b41 100644
--- a/poky/meta/recipes-extended/libarchive/libarchive_3.6.0.bb
+++ b/poky/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
@@ -35,7 +35,7 @@
SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
UPSTREAM_CHECK_URI = "http://libarchive.org/"
-SRC_URI[sha256sum] = "a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852"
+SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"
inherit autotools update-alternatives pkgconfig
diff --git a/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch b/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch
new file mode 100644
index 0000000..e43e73c
--- /dev/null
+++ b/poky/meta/recipes-extended/xz/xz/CVE-2022-1271.patch
@@ -0,0 +1,96 @@
+From dc932a1e9c0d9f1db71be11a9b82496e3a72f112 Mon Sep 17 00:00:00 2001
+From: Lasse Collin <lasse.collin@tukaani.org>
+Date: Tue, 29 Mar 2022 19:19:12 +0300
+Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587).
+
+Malicious filenames can make xzgrep to write to arbitrary files
+or (with a GNU sed extension) lead to arbitrary code execution.
+
+xzgrep from XZ Utils versions up to and including 5.2.5 are
+affected. 5.3.1alpha and 5.3.2alpha are affected as well.
+This patch works for all of them.
+
+This bug was inherited from gzip's zgrep. gzip 1.12 includes
+a fix for zgrep.
+
+The issue with the old sed script is that with multiple newlines,
+the N-command will read the second line of input, then the
+s-commands will be skipped because it's not the end of the
+file yet, then a new sed cycle starts and the pattern space
+is printed and emptied. So only the last line or two get escaped.
+
+One way to fix this would be to read all lines into the pattern
+space first. However, the included fix is even simpler: All lines
+except the last line get a backslash appended at the end. To ensure
+that shell command substitution doesn't eat a possible trailing
+newline, a colon is appended to the filename before escaping.
+The colon is later used to separate the filename from the grep
+output so it is fine to add it here instead of a few lines later.
+
+The old code also wasn't POSIX compliant as it used \n in the
+replacement section of the s-command. Using \<newline> is the
+POSIX compatible method.
+
+LC_ALL=C was added to the two critical sed commands. POSIX sed
+manual recommends it when using sed to manipulate pathnames
+because in other locales invalid multibyte sequences might
+cause issues with some sed implementations. In case of GNU sed,
+these particular sed scripts wouldn't have such problems but some
+other scripts could have, see:
+
+ info '(sed)Locale Considerations'
+
+This vulnerability was discovered by:
+cleemy desu wayo working with Trend Micro Zero Day Initiative
+
+Thanks to Jim Meyering and Paul Eggert discussing the different
+ways to fix this and for coordinating the patch release schedule
+with gzip.
+
+Upstream-Status: Backport [https://tukaani.org/xz/xzgrep-ZDI-CAN-16587.patch]
+CVE: CVE-2022-1271
+
+Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
+---
+ src/scripts/xzgrep.in | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in
+index 9db5c3a..f64dddb 100644
+--- a/src/scripts/xzgrep.in
++++ b/src/scripts/xzgrep.in
+@@ -179,22 +179,26 @@ for i; do
+ { test $# -eq 1 || test $no_filename -eq 1; }; then
+ eval "$grep"
+ else
++ # Append a colon so that the last character will never be a newline
++ # which would otherwise get lost in shell command substitution.
++ i="$i:"
++
++ # Escape & \ | and newlines only if such characters are present
++ # (speed optimization).
+ case $i in
+ (*'
+ '* | *'&'* | *'\'* | *'|'*)
+- i=$(printf '%s\n' "$i" |
+- sed '
+- $!N
+- $s/[&\|]/\\&/g
+- $s/\n/\\n/g
+- ');;
++ i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');;
+ esac
+- sed_script="s|^|$i:|"
++
++ # $i already ends with a colon so don't add it here.
++ sed_script="s|^|$i|"
+
+ # Fail if grep or sed fails.
+ r=$(
+ exec 4>&1
+- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&-
++ (eval "$grep" 4>&-; echo $? >&4) 3>&- |
++ LC_ALL=C sed "$sed_script" >&3 4>&-
+ ) || r=2
+ exit $r
+ fi >&3 5>&-
diff --git a/poky/meta/recipes-extended/xz/xz_5.2.5.bb b/poky/meta/recipes-extended/xz/xz_5.2.5.bb
index 78aa6b2..720e070 100644
--- a/poky/meta/recipes-extended/xz/xz_5.2.5.bb
+++ b/poky/meta/recipes-extended/xz/xz_5.2.5.bb
@@ -24,7 +24,9 @@
file://lib/getopt.c;endline=23;md5=2069b0ee710572c03bb3114e4532cd84 \
"
-SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz"
+SRC_URI = "https://tukaani.org/xz/xz-${PV}.tar.gz \
+ file://CVE-2022-1271.patch \
+ "
SRC_URI[md5sum] = "0d270c997aff29708c74d53f599ef717"
SRC_URI[sha256sum] = "f6f4910fd033078738bd82bfba4f49219d03b17eb0794eb91efbae419f4aba10"
UPSTREAM_CHECK_REGEX = "xz-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.204.1.bb b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.204.1.bb
index dc78073..4c908d8 100644
--- a/poky/meta/recipes-graphics/spir/spirv-tools_1.3.204.1.bb
+++ b/poky/meta/recipes-graphics/spir/spirv-tools_1.3.204.1.bb
@@ -8,7 +8,7 @@
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRCREV = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=stable;protocol=https"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=sdk-1.3.204;protocol=https"
PE = "1"
UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"