Skip to content

Commit f8ad1f4

Browse files
lumaglumag
authored
ci: base.lock: update layers to latest (20260825) (qualcomm-linux#3004)
Refresh the upstream layer pins in `ci/base.lock.yml` to latest, and adapt the two local meta-oe redis patches to meta-oe's move to redis 8.10.1. | layer | old | new | commits | |---|---|---|---| | oe-core | 07a342aa80 | ace4d72157 | 145 | | bitbake | 7a3cb0d55e | c6a1288cb1 | 20 | | meta-arm | 170b7e2a1c | 86b180b091 | 1 | | meta-openembedded | 2ed8e354cd | 7af0bdb0fe | 190 | | meta-updater | 4de44b40a0 | c6266761a5 | 1 | Per-layer changelogs are in the base.lock commit message. The redis -Og patch is dropped (merged upstream as meta-oe f912ecdc55ae); the install-prefix patch is regenerated against `redis_8.10.1.bb` and still submitted upstream. Highlights: gcc 16.2, rust 1.97.1, glibc 2.44 updates, linux-yocto v6.18.44, mesa 26.2.1, redis 8.10.1, ostree 2026.3 (meta-oe and meta-updater move together).
2 parents 156395e + 0e75b98 commit f8ad1f4

6 files changed

Lines changed: 110 additions & 80 deletions

‎ci/base.lock.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ header:
33
overrides:
44
repos:
55
oe-core:
6-
commit: 07a342aa80c7349dd014f743a695a5e006add8df
6+
commit: ace4d721578b8bbb217d760ee86171009d2efc7c
77
bitbake:
8-
commit: 7a3cb0d55e3698e883a9ff8491febc9d155482ca
8+
commit: c6a1288cb15171297c5607a8f6f6c01595ba8b8e
99
meta-arm:
10-
commit: 170b7e2a1c264c2f6360b4e298b16542196601af
10+
commit: 86b180b091c0bd595a31fe11fb5e2677a5bfd790
1111
meta-openembedded:
12-
commit: 2ed8e354cdf2d7d99dfa0f9b6a204078dbf83d7a
12+
commit: 7af0bdb0fec638be67d8fe4e655f026e0d08a312
1313
meta-virtualization:
1414
commit: f45cc3787c11d040dbef8e7f956a4da420375829
1515
meta-audioreach:
1616
commit: 3f673ee6f52bfeda69205078a99e89cd501015b4
1717
meta-selinux:
1818
commit: 7351443c6579671bcf048817438f1740ad23eaab
1919
meta-updater:
20-
commit: 4de44b40a0d315daf3f5f4206add67dc244a16a2
20+
commit: c6266761a5a62eba1695fe9bf7bdfa4a414c00c2
2121
meta-security:
2222
commit: 226839ac408223f8041cde1b1d8b762d6fbc8050
2323
meta-dpdk:

‎ci/base.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ repos:
1818
fix-igt-pause:
1919
repo: meta-qcom
2020
path: patches/oe-core/0001-igt-gpu-tools-fix-build-on-non-x86-platforms.patch
21+
scons-variables-revert:
22+
repo: meta-qcom
23+
path: patches/oe-core/0002-python3-scons-backport-revert-of-the-4.11.0-Variables.patch
2124
layers:
2225
meta:
2326

‎ci/qcom-distro.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ repos:
1717
meta-openembedded:
1818
url: https://github.com/openembedded/meta-openembedded
1919
patches:
20-
redis-xxhash-og:
21-
repo: meta-qcom
22-
path: patches/meta-oe/0001-redis-fix-build-of-the-bundled-xxHash-with-Og.patch
2320
redis-install-prefix:
2421
repo: meta-qcom
25-
path: patches/meta-oe/0002-redis-fix-the-install-prefix-with-8.10.0.patch
22+
path: patches/meta-oe/0001-redis-fix-the-install-prefix-with-8.10.0.patch
2623
layers:
2724
meta-filesystems:
2825
meta-gnome:

‎patches/meta-oe/0001-redis-fix-build-of-the-bundled-xxHash-with-Og.patch‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

patches/meta-oe/0002-redis-fix-the-install-prefix-with-8.10.0.patch renamed to patches/meta-oe/0001-redis-fix-the-install-prefix-with-8.10.0.patch

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From cc7712f1158c6897a91c895db27a1c432cb84818 Mon Sep 17 00:00:00 2001
1+
From 86033d1d370f630f0515ba8765a21bbb5673aa1a Mon Sep 17 00:00:00 2001
22
From: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
33
Date: Fri, 21 Aug 2026 15:34:03 +0000
44
Subject: [PATCH] redis: fix the install prefix with 8.10.0
@@ -24,14 +24,14 @@ AI-Generated: Uses Claude Code
2424
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
2525
Upstream-Status: Submitted [https://lists.openembedded.org/g/openembedded-devel/message/129474]
2626
---
27-
meta-oe/recipes-extended/redis/redis_8.10.0.bb | 3 +--
27+
meta-oe/recipes-extended/redis/redis_8.10.1.bb | 3 +--
2828
1 file changed, 1 insertion(+), 2 deletions(-)
2929

30-
diff --git a/meta-oe/recipes-extended/redis/redis_8.10.0.bb b/meta-oe/recipes-extended/redis/redis_8.10.0.bb
31-
index 6176dc45be..13d6aa1066 100644
32-
--- a/meta-oe/recipes-extended/redis/redis_8.10.0.bb
33-
+++ b/meta-oe/recipes-extended/redis/redis_8.10.0.bb
34-
@@ -56,8 +56,7 @@ do_compile() {
30+
diff --git a/meta-oe/recipes-extended/redis/redis_8.10.1.bb b/meta-oe/recipes-extended/redis/redis_8.10.1.bb
31+
index 7c017e957..d0220d228 100644
32+
--- a/meta-oe/recipes-extended/redis/redis_8.10.1.bb
33+
+++ b/meta-oe/recipes-extended/redis/redis_8.10.1.bb
34+
@@ -65,8 +65,7 @@ do_compile() {
3535
}
3636

3737
do_install() {
@@ -41,3 +41,6 @@ index 6176dc45be..13d6aa1066 100644
4141
install -d ${D}/${sysconfdir}/redis
4242
install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
4343
install -d ${D}/${sysconfdir}/init.d
44+
--
45+
2.43.0
46+

‎patches/oe-core/0002-python3-scons-backport-revert-of-the-4.11.0-Variables.patch‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
From 9a81ef60d58fa52c1e2f6f7a3b3d325a1b9b8215 Mon Sep 17 00:00:00 2001
2+
From: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
3+
Date: Wed, 26 Aug 2026 19:58:32 +0000
4+
Subject: [PATCH] python3-scons: backport revert of the 4.11.0 Variables()
5+
change
6+
7+
scons 4.11.0 resolves a saved-variables file through a File node, which
8+
creates a node for a file that does not exist. That breaks gpsd's install
9+
step, which fails unlinking a path that is not there, and makes Glob()
10+
return phantom entries for other projects (SCons issues #4894 and #4893,
11+
both regressions from 4.10.1). Upstream reverted it for 4.11.1, so
12+
backport that revert until the release is available.
13+
14+
AI-Generated: Uses Claude Code
15+
Signed-off-by: Ricardo Salveti <ricardo.salveti@oss.qualcomm.com>
16+
Upstream-Status: Submitted [https://lists.openembedded.org/g/openembedded-core/message/244414]
17+
---
18+
...evert-a-breaking-change-to-Variables.patch | 48 +++++++++++++++++++
19+
.../python/python3-scons_4.11.0.bb | 1 +
20+
2 files changed, 49 insertions(+)
21+
create mode 100644 meta/recipes-devtools/python/python3-scons/0001-Revert-a-breaking-change-to-Variables.patch
22+
23+
diff --git a/meta/recipes-devtools/python/python3-scons/0001-Revert-a-breaking-change-to-Variables.patch b/meta/recipes-devtools/python/python3-scons/0001-Revert-a-breaking-change-to-Variables.patch
24+
new file mode 100644
25+
index 0000000000..b11de965c3
26+
--- /dev/null
27+
+++ b/meta/recipes-devtools/python/python3-scons/0001-Revert-a-breaking-change-to-Variables.patch
28+
@@ -0,0 +1,48 @@
29+
+From efa7ab507067e31b71ced010097e6f92cf71030f Mon Sep 17 00:00:00 2001
30+
+From: Mats Wichmann <mats@linux.com>
31+
+Date: Wed, 19 Aug 2026 14:21:44 -0600
32+
+Subject: [PATCH] Revert a breaking change to Variables()
33+
+
34+
+In 4.11.0, via PR #4875, a saved-Variables file was looked up through
35+
+a File node. This change is (temporarily) reverted due to side effects;
36+
+Variables returns to reading the file directly with open/read.
37+
+
38+
+Upstream-Status: Backport [https://github.com/SCons/scons/commit/efa7ab507067e31b71ced010097e6f92cf71030f]
39+
+Signed-off-by: Mats Wichmann <mats@linux.com>
40+
+---
41+
+ SCons/Variables/__init__.py | 12 +++++-------
42+
+ 1 file changed, 5 insertions(+), 7 deletions(-)
43+
+
44+
+diff --git a/SCons/Variables/__init__.py b/SCons/Variables/__init__.py
45+
+index c8ce37c84..dea36ddd0 100644
46+
+--- a/SCons/Variables/__init__.py
47+
++++ b/SCons/Variables/__init__.py
48+
+@@ -271,20 +271,18 @@ class Variables:
49+
+
50+
+ # next set the values specified in any saved-variables script(s)
51+
+ for filename in self.files:
52+
+- # Resolve the saved-variables file through the File() node so it
53+
+- # is found in the source directory (or a repository) as well as
54+
+- # the build directory, e.g. when using a variant dir (issue #816).
55+
+- node = env.File(filename)
56+
+- contents = node.get_text_contents()
57+
+- if contents:
58+
++ # TODO: issue #816 use Node to access saved-variables file?
59+
++ if os.path.exists(filename):
60+
+ # issue #4645: don't exec directly into values,
61+
+ # so we can iterate through for unknown variables.
62+
+ temp_values = {}
63+
+- dirname = os.path.split(node.get_abspath())[0]
64+
++ dirname = os.path.split(os.path.abspath(filename))[0]
65+
+ if dirname:
66+
+ sys.path.insert(0, dirname)
67+
+ try:
68+
+ temp_values['__name__'] = filename
69+
++ with open(filename) as f:
70+
++ contents = f.read()
71+
+ exec(contents, {}, temp_values)
72+
+ finally:
73+
+ if dirname:
74+
+--
75+
+2.43.0
76+
+
77+
diff --git a/meta/recipes-devtools/python/python3-scons_4.11.0.bb b/meta/recipes-devtools/python/python3-scons_4.11.0.bb
78+
index 585cad271c..491ff4d10f 100644
79+
--- a/meta/recipes-devtools/python/python3-scons_4.11.0.bb
80+
+++ b/meta/recipes-devtools/python/python3-scons_4.11.0.bb
81+
@@ -4,6 +4,7 @@ SECTION = "devel/python"
82+
LICENSE = "MIT"
83+
LIC_FILES_CHKSUM = "file://LICENSE;md5=d903b0b8027f461402bac9b5169b36f7"
84+
85+
+SRC_URI += "file://0001-Revert-a-breaking-change-to-Variables.patch"
86+
SRC_URI[sha256sum] = "5ba48f9e2eb6b9178cabdc9893792418e6970c84f43f4b027e4468e20616a89c"
87+
88+
inherit pypi python_setuptools_build_meta
89+
--
90+
2.43.0
91+

0 commit comments

Comments
 (0)