Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 32 messages Nov 20, 2024

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for styhead and have comments back by end of day Friday, November 22

Passed a-full on autobuilder:

https://valkyrie.yoctoproject.org/#/builders/29/builds/464

The following changes since commit 92cc48d51c763249b2eb8b4181bc20056fc72264:

glibc: Fix missing randomness in __gen_tempname (2024-11-02 06:21:52 -0700)

are available in the Git repository at:

https://git.openembedded.org/openembedded-core-contrib stable/styhead-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/styhead-nut

Aditya Tayade (1):
e2fsprogs: removed 'sed -u' option

Alban Bedel (1):
util-linux: Add findmnt to the bash completion RDEPENDS

Chen Qi (2):
toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails
libgfortran: fix buildpath QA issue

Claus Stovgaard (1):
lib/oe/package-manager: skip processing installed-pkgs with empty
globs

Clayton Casciato (1):
uboot-sign: fix concat_dtb arguments

Hiago De Franco (1):
weston: backport patch to allow neatvnc < v0.9.0

Hongxu Jia (1):
gcc-source: Fix racing on building gcc-source-14.2.0 and

    lib32-gcc-source-14.2.0

Jagadeesh Krishnanjanappa (1):
tune-cortexa32: set tune feature as armv8a

Jinfeng Wang (2):
tzdata/tzcode-native: upgrade 2024a -> 2024b glib-2.0: fix glib-2.0 ptest failure when upgrading tzdata2024b

Katawann (1):
cve-check: add field "modified" to JSON report

Mikko Rapeli (1):
ovmf-native: remove .pyc files from install

Pavel Zhukov (1):
package_rpm: Check if file exists before open()

Peter Marko (3):
cve-check: add support for cvss v4.0
go: upgrade 1.22.6 -> 1.22.7
go: upgrade 1.22.7 -> 1.22.8

Purushottam Choudhary (1):
virglrenderer: Add patch to fix -int-conversion build issue

Regis Dargent (1):
udev-extraconf: fix network.sh script did not configure hotplugged
interfaces

Richard Purdie (4):
pseudo: Fix envp bug and add posix_spawn wrapper oeqa/runtime/ssh: Rework ssh timeout oeqa/runtime/ssh: Fix incorrect timeout fix
qemurunner: Clean up serial_lock handling

Robert Yang (1):
cml1.bbclass: do_diffconfig: Don't override .config with .config.orig

Ross Burton (3):
strace: download release tarballs from GitHub
tcl: skip io-13.6 test case
groff: fix rare build race in hdtbl

Tom Hochstein (1):
weston: Add missing runtime dependency on freerdp

Vijay Anusuri (1):
xserver-xorg: upgrade 21.1.13 -> 21.1.14

Wang Mingyu (1):
wireless-regdb: upgrade 2024.07.04 -> 2024.10.07

Yoann Congal (1):
python3-maturin: sort external libs in wheel files

 meta/classes-global/package_rpm.bbclass       | 16 +++-
 meta/classes-recipe/cml1.bbclass              |  3 +-
 meta/classes-recipe/uboot-sign.bbclass        |  2 +-
 meta/classes/cve-check.bbclass                | 11 ++-
 meta/classes/vex.bbclass                      |  1 +
 .../include/arm/armv8a/tune-cortexa32.inc     |  2 +-
 meta/conf/multilib.conf                       |  2 +-
 meta/files/toolchain-shar-extract.sh          |  4 +
 meta/lib/oe/package_manager/__init__.py       | 76 +++++++++----------
 meta/lib/oeqa/runtime/cases/ssh.py            |  4 +-
 meta/lib/oeqa/utils/qemurunner.py             | 11 +--
 .../files/gdatetime-test-fail-0001.patch      | 72 ++++++++++++++++++
 .../files/gdatetime-test-fail-0002.patch      | 65 ++++++++++++++++
 .../files/gdatetime-test-fail-0003.patch      | 63 +++++++++++++++
 meta/recipes-core/glib-2.0/glib.inc           |  3 +
 .../meta/cve-update-nvd2-native.bb            | 14 +++-
 meta/recipes-core/ovmf/ovmf_git.bb            |  1 +
 .../udev/udev-extraconf/network.sh            | 32 --------
 .../util-linux/util-linux_2.40.2.bb           |  2 +-
 .../e2fsprogs/e2fsprogs/run-ptest             |  3 +-
 meta/recipes-devtools/gcc/gcc-source_14.2.bb  |  1 +
 meta/recipes-devtools/gcc/libgfortran.inc     |  2 +-
 .../go/{go-1.22.6.inc => go-1.22.8.inc}       |  2 +-
 ...e_1.22.6.bb => go-binary-native_1.22.8.bb} |  6 +-
 ..._1.22.6.bb => go-cross-canadian_1.22.8.bb} |  0
 ...{go-cross_1.22.6.bb => go-cross_1.22.8.bb} |  0
 ...osssdk_1.22.6.bb => go-crosssdk_1.22.8.bb} |  0
 ...runtime_1.22.6.bb => go-runtime_1.22.8.bb} |  0
 .../go/{go_1.22.6.bb => go_1.22.8.bb}         |  0
 meta/recipes-devtools/pseudo/pseudo_git.bb    |  2 +-
 ...prove-wheel-reproducibility-by-sorti.patch | 55 ++++++++++++++
 .../python/python3-maturin_1.7.1.bb           |  1 +
 meta/recipes-devtools/strace/strace_6.10.bb   |  4 +-
 meta/recipes-devtools/tcltk/tcl/run-ptest     |  2 +
 ...l-Fix-Savannah-66316-missing-grn-dep.patch | 38 ++++++++++
 meta/recipes-extended/groff/groff_1.23.0.bb   |  1 +
 meta/recipes-extended/timezone/timezone.inc   |  6 +-
 ...nversion-fatal-build-error-with-GCC-.patch | 41 ++++++++++
 .../virglrenderer/virglrenderer_1.0.1.bb      |  1 +
 ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 +++++++
 .../recipes-graphics/wayland/weston_13.0.3.bb |  3 +-
 ...org_21.1.13.bb => xserver-xorg_21.1.14.bb} |  2 +-
 ....07.04.bb => wireless-regdb_2024.10.07.bb} |  2 +-
 scripts/cve-json-to-text.py                   |  2 +
 44 files changed, 474 insertions(+), 111 deletions(-)
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch
 rename meta/recipes-devtools/go/{go-1.22.6.inc => go-1.22.8.inc} (89%)
 rename meta/recipes-devtools/go/{go-binary-native_1.22.6.bb => go-binary-native_1.22.8.bb} (78%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.22.6.bb => go-cross-canadian_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.22.6.bb => go-cross_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.22.6.bb => go-crosssdk_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.22.6.bb => go-runtime_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.22.6.bb => go_1.22.8.bb} (100%)
 create mode 100644 meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch
 create mode 100644 meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
 create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.13.bb => xserver-xorg_21.1.14.bb} (92%)
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} (94%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/31 cve-check: add field "modified" to JSON report

From: Katawann <[email protected]>

Added the "modified" field to the JSON export in the cve-check.class. This field captures the last modification date of each CVE, providing more detailed information on changes and updates within the exported data.

(cherry picked from commit 740b8a0b23c4021d07c3714420e3ea8b46e61454)
---
 meta/classes/cve-check.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/cve-check.bbclass +1 -0
index a5104f210b..6245594dd7 100644
@@ -534,6 +534,7 @@ def cve_write_data_json(d, cve_data, cve_status):
             cve_item["summary"] = cve_data[cve]["NVD-summary"]
             cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"]
             cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"]
+            cve_item["modified"] = cve_data[cve]["NVD-modified"]
             cve_item["vector"] = cve_data[cve]["NVD-vector"]
             cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"]
         if 'status' in cve_data[cve]:
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/31 cve-check: add support for cvss v4.0

In reply to Steve Sakoman

From: Peter Marko <[email protected]>

https://nvd.nist.gov/general/news/cvss-v4-0-official-support

CVSS v4.0 was released in November 2023
NVD announced support for it in June 2024

Current stats are:
* cvss v4 provided, but also v3, so cve-check showed a value sqlite> select count(*) from nvd where scorev4 != 0.0 and scorev3 != 0.0; 2069
* only cvss v4 provided, so cve-check did not show any sqlite> select count(*) from nvd where scorev4 != 0.0 and scorev3 = 0.0; 260

(cherry picked from commit 358dbfcd80ae1fa414d294c865dd293670c287f0)
---
 meta/classes/cve-check.bbclass                   | 10 ++++++----
 meta/classes/vex.bbclass                         |  1 +
 meta/recipes-core/meta/cve-update-nvd2-native.bb | 14 ++++++++++----
 scripts/cve-json-to-text.py                      |  2 ++
 4 files changed, 19 insertions(+), 8 deletions(-)
meta/classes/cve-check.bbclass +6 -4
index 6245594dd7..0c92b87f52 100644
@@ -31,7 +31,7 @@
 CVE_PRODUCT ??= "${BPN}"
 CVE_VERSION ??= "${PV}"
 
-CVE_CHECK_DB_FILENAME ?= "nvdcve_2-1.db"
+CVE_CHECK_DB_FILENAME ?= "nvdcve_2-2.db"
 CVE_CHECK_DB_DIR ?= "${STAGING_DIR}/CVE_CHECK"
 CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/${CVE_CHECK_DB_FILENAME}"
 CVE_CHECK_DB_FILE_LOCK ?= "${CVE_CHECK_DB_FILE}.lock"
@@ -445,9 +445,10 @@ def get_cve_info(d, cve_data):
             cve_data[row[0]]["NVD-summary"] = row[1]
             cve_data[row[0]]["NVD-scorev2"] = row[2]
             cve_data[row[0]]["NVD-scorev3"] = row[3]
-            cve_data[row[0]]["NVD-modified"] = row[4]
-            cve_data[row[0]]["NVD-vector"] = row[5]
-            cve_data[row[0]]["NVD-vectorString"] = row[6]
+            cve_data[row[0]]["NVD-scorev4"] = row[4]
+            cve_data[row[0]]["NVD-modified"] = row[5]
+            cve_data[row[0]]["NVD-vector"] = row[6]
+            cve_data[row[0]]["NVD-vectorString"] = row[7]
         cursor.close()
     conn.close()
 
@@ -534,6 +535,7 @@ def cve_write_data_json(d, cve_data, cve_status):
             cve_item["summary"] = cve_data[cve]["NVD-summary"]
             cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"]
             cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"]
+            cve_item["scorev4"] = cve_data[cve]["NVD-scorev4"]
             cve_item["modified"] = cve_data[cve]["NVD-modified"]
             cve_item["vector"] = cve_data[cve]["NVD-vector"]
             cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"]
meta/classes/vex.bbclass +1 -0
index bb16e2a529..01d4e52051 100644
@@ -282,6 +282,7 @@ def cve_write_data_json(d, cve_data, cve_status):
             cve_item["summary"] = cve_data[cve]["NVD-summary"]
             cve_item["scorev2"] = cve_data[cve]["NVD-scorev2"]
             cve_item["scorev3"] = cve_data[cve]["NVD-scorev3"]
+            cve_item["scorev4"] = cve_data[cve]["NVD-scorev4"]
             cve_item["vector"] = cve_data[cve]["NVD-vector"]
             cve_item["vectorString"] = cve_data[cve]["NVD-vectorString"]
         if 'status' in cve_data[cve]:
meta/recipes-core/meta/cve-update-nvd2-native.bb +10 -4
index 2d23d28c3e..5fbe9095cc 100644
@@ -255,7 +255,7 @@ def initialize_db(conn):
         c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)")
 
         c.execute("CREATE TABLE IF NOT EXISTS NVD (ID TEXT UNIQUE, SUMMARY TEXT, \
-            SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)")
+            SCOREV2 TEXT, SCOREV3 TEXT, SCOREV4 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)")
 
         c.execute("CREATE TABLE IF NOT EXISTS PRODUCTS (ID TEXT, \
             VENDOR TEXT, PRODUCT TEXT, VERSION_START TEXT, OPERATOR_START TEXT, \
@@ -361,12 +361,18 @@ def update_db(conn, elt):
         cvssv3 = cvssv3 or elt['cve']['metrics']['cvssMetricV31'][0]['cvssData']['baseScore']
     except KeyError:
         pass
+    cvssv3 = cvssv3 or 0.0
+    try:
+        accessVector = accessVector or elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['attackVector']
+        vectorString = vectorString or elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['vectorString']
+        cvssv4 = elt['cve']['metrics']['cvssMetricV40'][0]['cvssData']['baseScore']
+    except KeyError:
+        cvssv4 = 0.0
     accessVector = accessVector or "UNKNOWN"
     vectorString = vectorString or "UNKNOWN"
-    cvssv3 = cvssv3 or 0.0
 
-    conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?)",
-                [cveId, cveDesc, cvssv2, cvssv3, date, accessVector, vectorString]).close()
+    conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?, ?)",
+                [cveId, cveDesc, cvssv2, cvssv3, cvssv4, date, accessVector, vectorString]).close()
 
     try:
         # Remove any pre-existing CVE configuration. Even for partial database
scripts/cve-json-to-text.py +2 -0
index 5531ee5eb6..87a5669987 100755
@@ -125,6 +125,8 @@ def process_data(filename, data):
                 lines += "CVSS v2 BASE SCORE: %s\n" % issue["scorev2"]
             if "scorev3" in issue:
                 lines += "CVSS v3 BASE SCORE: %s\n" % issue["scorev3"]
+            if "scorev4" in issue:
+                lines += "CVSS v4 BASE SCORE: %s\n" % issue["scorev4"]
             if "vector" in issue:
                 lines += "VECTOR: %s\n" % issue["vector"]
             if "vectorString" in issue:
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/31 xserver-xorg: upgrade 21.1.13 -> 21.1.14

In reply to Steve Sakoman

From: Vijay Anusuri <[email protected]>

Includes security fix CVE-2024-9632

Ref: https://lists.x.org/archives/xorg/2024-October/061765.html

---
 .../{xserver-xorg_21.1.13.bb => xserver-xorg_21.1.14.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.13.bb => xserver-xorg_21.1.14.bb} (92%)
meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.14.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb +1 -1
similarity index 92%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.14.bb
index 1f18c22fa8..28c98eb527 100644
@@ -3,7 +3,7 @@ require xserver-xorg.inc
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
            "
-SRC_URI[sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c"
+SRC_URI[sha256sum] = "8f2102cebdc4747d1656c1099ef610f5063c7422c24a177e300de569b354ee35"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/31 tzdata/tzcode-native: upgrade 2024a -> 2024b

In reply to Steve Sakoman

From: Jinfeng Wang <[email protected]>

(cherry picked from commit b84b29b1827624270cc1698feda2ee87d55c01e4)
---
 meta/recipes-extended/timezone/timezone.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-extended/timezone/timezone.inc +3 -3
index 4734adcc08..adf095280f 100644
@@ -6,7 +6,7 @@ SECTION = "base"
 LICENSE = "PD & BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"
 
-PV = "2024a"
+PV = "2024b"
 
 SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \
            http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \
@@ -16,5 +16,5 @@ S = "${WORKDIR}/tz"
 
 UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"
 
-SRC_URI[tzcode.sha256sum] = "80072894adff5a458f1d143e16e4ca1d8b2a122c9c5399da482cb68cba6a1ff8"
-SRC_URI[tzdata.sha256sum] = "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3"
+SRC_URI[tzcode.sha256sum] = "5e438fc449624906af16a18ff4573739f0cda9862e5ec28d3bcb19cbaed0f672"
+SRC_URI[tzdata.sha256sum] = "70e754db126a8d0db3d16d6b4cb5f7ec1e04d5f261255e4558a67fe92d39e550"
Signature · 1 line
2.34.1
#5 lore raw

PATCH 5/31 wireless-regdb: upgrade 2024.07.04 -> 2024.10.07

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

(cherry picked from commit f124bb09a798d94eca5e93387bc361b147ce53f9)
---
 ...ireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2024.07.04.bb => wireless-regdb_2024.10.07.bb} (94%)
meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb renamed from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb +1 -1
similarity index 94%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.07.04.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2024.10.07.bb
index daf5e6dfcd..0e4100fba7 100644
@@ -5,7 +5,7 @@ LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
 
 SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "9832a14e1be24abff7be30dee3c9a1afb5fdfcf475a0d91aafef039f8d85f5eb"
+SRC_URI[sha256sum] = "f76f2bd79a653e9f9dd50548d99d03a4a4eb157da056dfd5892f403ec28fb3d5"
 
 inherit bin_package allarch
 
Signature · 1 line
2.34.1
#6 lore raw

PATCH 6/31 go: upgrade 1.22.6 -> 1.22.7

In reply to Steve Sakoman

From: Peter Marko <[email protected]>

Upgrade to latest 1.22.x release [1]:

$ git --no-pager log --oneline go1.22.6..go1.22.7
7529d09a11 (tag: go1.22.7) [release-branch.go1.22] go1.22.7
d4c53812e6 [release-branch.go1.22] go/build/constraint: add parsing limits
2092294f2b [release-branch.go1.22] encoding/gob: cover missed cases when checking ignore depth
b232596139 [release-branch.go1.22] go/parser: track depth in nested element lists
e87be9833e [release-branch.go1.22] runtime: on AIX, fix call to _cgo_sys_thread_create in _rt0_ppc64_aix_lib
676d6100d8 [release-branch.go1.22] cmd/fix: support go versions with patch release
0a525a3ed0 [release-branch.go1.22] os: fix Chtimes test flakes

Fixes CVE-2024-34155, CVE-2024-34156 and CVE-2024-34158

[1] https://github.com/golang/go/compare/go1.22.6...go1.22.7

(cherry picked from commit 92d609c49c0870ca10fcc39d52a801109d65a98b)
---
 meta/recipes-devtools/go/{go-1.22.6.inc => go-1.22.7.inc}   | 2 +-
 ...o-binary-native_1.22.6.bb => go-binary-native_1.22.7.bb} | 6 +++---
 ...cross-canadian_1.22.6.bb => go-cross-canadian_1.22.7.bb} | 0
 .../go/{go-cross_1.22.6.bb => go-cross_1.22.7.bb}           | 0
 .../go/{go-crosssdk_1.22.6.bb => go-crosssdk_1.22.7.bb}     | 0
 .../go/{go-runtime_1.22.6.bb => go-runtime_1.22.7.bb}       | 0
 meta/recipes-devtools/go/{go_1.22.6.bb => go_1.22.7.bb}     | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/go/{go-1.22.6.inc => go-1.22.7.inc} (89%)
 rename meta/recipes-devtools/go/{go-binary-native_1.22.6.bb => go-binary-native_1.22.7.bb} (78%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.22.6.bb => go-cross-canadian_1.22.7.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.22.6.bb => go-cross_1.22.7.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.22.6.bb => go-crosssdk_1.22.7.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.22.6.bb => go-runtime_1.22.7.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.22.6.bb => go_1.22.7.bb} (100%)
meta/recipes-devtools/go/go-1.22.7.inc renamed from meta/recipes-devtools/go/go-1.22.6.inc +1 -1
similarity index 89%
rename from meta/recipes-devtools/go/go-1.22.6.inc
rename to meta/recipes-devtools/go/go-1.22.7.inc
index 834debaf9b..e54a902741 100644
@@ -15,4 +15,4 @@ SRC_URI += "\
     file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
     file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
 "
-SRC_URI[main.sha256sum] = "9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51"
+SRC_URI[main.sha256sum] = "66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f"
meta/recipes-devtools/go/go-binary-native_1.22.7.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.6.bb +3 -3
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.22.6.bb
rename to meta/recipes-devtools/go/go-binary-native_1.22.7.bb
index ea4577f20a..aba317fd38 100644
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
 
 # Checksums available at https://go.dev/dl/
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616"
-SRC_URI[go_linux_arm64.sha256sum] = "c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2"
-SRC_URI[go_linux_ppc64le.sha256sum] = "9d99fce3f6f72a76630fe91ec0884dfe3db828def4713368424900fa98bb2bd6"
+SRC_URI[go_linux_amd64.sha256sum] = "fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb"
+SRC_URI[go_linux_arm64.sha256sum] = "ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885"
+SRC_URI[go_linux_ppc64le.sha256sum] = "a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb
meta/recipes-devtools/go/go-cross_1.22.7.bb renamed from meta/recipes-devtools/go/go-cross_1.22.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.22.6.bb
rename to meta/recipes-devtools/go/go-cross_1.22.7.bb
meta/recipes-devtools/go/go-crosssdk_1.22.7.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.22.6.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.22.7.bb
meta/recipes-devtools/go/go-runtime_1.22.7.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.22.6.bb
rename to meta/recipes-devtools/go/go-runtime_1.22.7.bb
meta/recipes-devtools/go/go_1.22.7.bb renamed from meta/recipes-devtools/go/go_1.22.6.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.22.6.bb
rename to meta/recipes-devtools/go/go_1.22.7.bb
Signature · 1 line
2.34.1
#7 lore raw

PATCH 7/31 go: upgrade 1.22.7 -> 1.22.8

In reply to Steve Sakoman

From: Peter Marko <[email protected]>

Upgrade to latest 1.22.x release [1]:

$ git --no-pager log --oneline go1.22.7..go1.22.8
aeccd613c8 (tag: go1.22.8) [release-branch.go1.22] go1.22.8
b4086b7c16 [release-branch.go1.22] syscall: skip TestAmbientCapsUserns when restricted, document
6fab4b9a9e [release-branch.go1.22] runtime: size maps.Clone destination bucket array safely
71655f14ce [release-branch.go1.22] cmd/cgo: correct padding required by alignment

[1] https://github.com/golang/go/compare/go1.22.7...go1.22.8

(cherry picked from commit 552b9913b25107d7a34611b499b7811896b5f098)
---
 meta/recipes-devtools/go/{go-1.22.7.inc => go-1.22.8.inc}   | 2 +-
 ...o-binary-native_1.22.7.bb => go-binary-native_1.22.8.bb} | 6 +++---
 ...cross-canadian_1.22.7.bb => go-cross-canadian_1.22.8.bb} | 0
 .../go/{go-cross_1.22.7.bb => go-cross_1.22.8.bb}           | 0
 .../go/{go-crosssdk_1.22.7.bb => go-crosssdk_1.22.8.bb}     | 0
 .../go/{go-runtime_1.22.7.bb => go-runtime_1.22.8.bb}       | 0
 meta/recipes-devtools/go/{go_1.22.7.bb => go_1.22.8.bb}     | 0
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/go/{go-1.22.7.inc => go-1.22.8.inc} (89%)
 rename meta/recipes-devtools/go/{go-binary-native_1.22.7.bb => go-binary-native_1.22.8.bb} (78%)
 rename meta/recipes-devtools/go/{go-cross-canadian_1.22.7.bb => go-cross-canadian_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-cross_1.22.7.bb => go-cross_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-crosssdk_1.22.7.bb => go-crosssdk_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go-runtime_1.22.7.bb => go-runtime_1.22.8.bb} (100%)
 rename meta/recipes-devtools/go/{go_1.22.7.bb => go_1.22.8.bb} (100%)
meta/recipes-devtools/go/go-1.22.8.inc renamed from meta/recipes-devtools/go/go-1.22.7.inc +1 -1
similarity index 89%
rename from meta/recipes-devtools/go/go-1.22.7.inc
rename to meta/recipes-devtools/go/go-1.22.8.inc
index e54a902741..542519b930 100644
@@ -15,4 +15,4 @@ SRC_URI += "\
     file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \
     file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \
 "
-SRC_URI[main.sha256sum] = "66432d87d85e0cfac3edffe637d5930fc4ddf5793313fe11e4a0f333023c879f"
+SRC_URI[main.sha256sum] = "df12c23ebf19dea0f4bf46a22cbeda4a3eca6f474f318390ce774974278440b8"
meta/recipes-devtools/go/go-binary-native_1.22.8.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.7.bb +3 -3
similarity index 78%
rename from meta/recipes-devtools/go/go-binary-native_1.22.7.bb
rename to meta/recipes-devtools/go/go-binary-native_1.22.8.bb
index aba317fd38..98799eb503 100644
@@ -9,9 +9,9 @@ PROVIDES = "go-native"
 
 # Checksums available at https://go.dev/dl/
 SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}"
-SRC_URI[go_linux_amd64.sha256sum] = "fc5d49b7a5035f1f1b265c17aa86e9819e6dc9af8260ad61430ee7fbe27881bb"
-SRC_URI[go_linux_arm64.sha256sum] = "ed695684438facbd7e0f286c30b7bc2411cfc605516d8127dc25c62fe5b03885"
-SRC_URI[go_linux_ppc64le.sha256sum] = "a6441d5da40a961039ec22b0aadbc8b513f52b31bb8919c359a7e2c3c5bcf26a"
+SRC_URI[go_linux_amd64.sha256sum] = "5f467d29fc67c7ae6468cb6ad5b047a274bae8180cac5e0b7ddbfeba3e47e18f"
+SRC_URI[go_linux_arm64.sha256sum] = "5c616b32dab04bb8c4c8700478381daea0174dc70083e4026321163879278a4a"
+SRC_URI[go_linux_ppc64le.sha256sum] = "c546f27866510bf8e54e86fe6f58c705af0e894341e5572c91f197a734152c27"
 
 UPSTREAM_CHECK_URI = "https://golang.org/dl/"
 UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross-canadian_1.22.7.bb
rename to meta/recipes-devtools/go/go-cross-canadian_1.22.8.bb
meta/recipes-devtools/go/go-cross_1.22.8.bb renamed from meta/recipes-devtools/go/go-cross_1.22.7.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-cross_1.22.7.bb
rename to meta/recipes-devtools/go/go-cross_1.22.8.bb
meta/recipes-devtools/go/go-crosssdk_1.22.8.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.7.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-crosssdk_1.22.7.bb
rename to meta/recipes-devtools/go/go-crosssdk_1.22.8.bb
meta/recipes-devtools/go/go-runtime_1.22.8.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.7.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go-runtime_1.22.7.bb
rename to meta/recipes-devtools/go/go-runtime_1.22.8.bb
meta/recipes-devtools/go/go_1.22.8.bb renamed from meta/recipes-devtools/go/go_1.22.7.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/go/go_1.22.7.bb
rename to meta/recipes-devtools/go/go_1.22.8.bb
Signature · 1 line
2.34.1
#8 lore raw

PATCH 8/31 weston: backport patch to allow neatvnc < v0.9.0

In reply to Steve Sakoman

From: Hiago De Franco <[email protected]>

Currently weston 13.0.3 with neatvnc 0.8.1 does not compile when using VNC:

| Dependency neatvnc found: NO found 0.8.1 but need: '< 0.8.0' ;
matched: '>= 0.7.0'

However weston upstream already increased the allowed version to 0.9.0, since neatvnc 0.8.0 does not introduce any changes that breaks API used by the VNC backend. Therefore, backport this patch.

(cherry picked from commit 8516496018a3ee9e81a67d4682bf9784d0eab2bd)
---
 ...1-vnc-Allow-neatvnc-in-version-0.8.0.patch | 27 +++++++++++++++++++
 .../recipes-graphics/wayland/weston_13.0.3.bb |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch
meta/recipes-graphics/wayland/weston/0001-vnc-Allow-neatvnc-in-version-0.8.0.patch new file +27 -0
new file mode 100644
index 0000000000..4ac1c075fd
@@ -0,0 +1,27 @@
+From 534cfa08ea0a0c2646b4aec20b16bf95f6d0aae6 Mon Sep 17 00:00:00 2001
+From: Lukasz Czechowski <[email protected]>
+Date: Mon, 3 Jun 2024 13:39:27 +0200
+Subject: [PATCH] vnc: Allow neatvnc in version 0.8.0
+
+Neat VNC 0.8.0 does not introduce any changes that breaks API used
+by VNC backend, so it is safe to extend compatibility.
+
+Upstream-Status: Backport [05e5405651054c580b248c4ab2791ed8d66369e3]
+Signed-off-by: Lukasz Czechowski <[email protected]>
+---
+ libweston/backend-vnc/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
+index b7b6916..39b15cf 100644
+--- a/libweston/backend-vnc/meson.build
++++ b/libweston/backend-vnc/meson.build
+@@ -3,7 +3,7 @@ if not get_option('backend-vnc')
+ endif
+ 
+ config_h.set('BUILD_VNC_COMPOSITOR', '1')
+-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
+ if not dep_neatvnc.found()
+ 	error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
+ endif
meta/recipes-graphics/wayland/weston_13.0.3.bb +1 -0
index e4843d38f7..19b242d01b 100644
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
 
 SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
            file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \
+           file://0001-vnc-Allow-neatvnc-in-version-0.8.0.patch \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
Signature · 1 line
2.34.1
#9 lore raw

PATCH 9/31 pseudo: Fix envp bug and add posix_spawn wrapper

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Fix pseudo with python 3.13 by adding a wrapper for posix_spawn and fixing a NULL pointer dereference in envp handling it uncovered. This fixes issues on Fedora 41.

(cherry picked from commit d80e20d70d170397f9827c5a5fc75ad1f2e8cd94)
---
 meta/recipes-devtools/pseudo/pseudo_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -1
index 7d8f71f65d..87c62e0678 100644
@@ -14,7 +14,7 @@ SRC_URI:append:class-nativesdk = " \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
-SRCREV = "374089f2ed83da4d0d4e58df067142ff99c7eb12"
+SRCREV = "28dcefb809ce95db997811b5662f0b893b9923e0"
 S = "${WORKDIR}/git"
 PV = "1.9.0+git"
 
Signature · 1 line
2.34.1
#10 lore raw

PATCH 10/31 uboot-sign: fix concat_dtb arguments

In reply to Steve Sakoman

From: Clayton Casciato <[email protected]>

Fixes [YOCTO #15642]

Ensure empty argument passed from do_uboot_assemble_fitimage is passed to concat_dtb

(cherry picked from commit b3c473785e5ceef677ff2b77c5fc17f5704c622f)
---
 meta/classes-recipe/uboot-sign.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/uboot-sign.bbclass +1 -1
index 3e5f5dcf66..a17be745ce 100644
@@ -338,7 +338,7 @@ uboot_assemble_fitimage_helper() {
 	binary="$2"
 
 	if [ "${UBOOT_SIGN_ENABLE}" = "1" -a -n "${UBOOT_DTB_BINARY}" ] ; then
-		concat_dtb $type $binary
+		concat_dtb "$type" "$binary"
 	fi
 
 	if [ "${UBOOT_FITIMAGE_ENABLE}" = "1" -a -n "${SPL_DTB_BINARY}" ]; then
Signature · 1 line
2.34.1
#11 lore raw

PATCH 11/31 strace: download release tarballs from GitHub

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

Switch to downloading the release tarballs from GitHub. Their CDN is rock solid, and strace.io is hosted inside Russia which some networks are blocking.

(cherry picked from commit bbdbd6d943a64e5b0dae4c2ee705d017fb7ef80e)
---
 meta/recipes-devtools/strace/strace_6.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/strace/strace_6.10.bb +2 -2
index a534fccd4f..d9f34c2f81 100644
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2433d82e1432a76dc3eadd9002bfe304"
 
-SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
+SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \
            file://update-gawk-paths.patch \
            file://Makefile-ptest.patch \
            file://run-ptest \
@@ -17,7 +17,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            "
 SRC_URI[sha256sum] = "765ec71aa1de2fe37363c1e40c7b7669fc1d40c44bb5d38ba8e8cd82c4edcf07"
 
-inherit autotools ptest
+inherit autotools github-releases ptest
 
 # Not yet ported to rv32
 COMPATIBLE_HOST:riscv32 = "null"
Signature · 1 line
2.34.1
#12 lore raw

PATCH 12/31 toolchain-shar-extract.sh: exit when post-relocate-setup.sh fails

In reply to Steve Sakoman

From: Chen Qi <[email protected]>

When LD_LIBRARY_PATH is set, post-relocate-setup.sh will fail and exit properly. But such failure is ignored and the SDK installation will continue and tell user that things succeed. This is misleading. So exit immediately if post-relocate-setup.sh fails.

Fixes [Yocto #15586]

(cherry picked from commit c8e2dcc1f71aa33cc6e56dfdebebbe7ef010c944)
---
 meta/files/toolchain-shar-extract.sh | 4 ++++
 1 file changed, 4 insertions(+)
meta/files/toolchain-shar-extract.sh +4 -0
index 89d30005fd..3b4647fca7 100644
@@ -286,6 +286,10 @@ post_relocate="$target_sdk_dir/post-relocate-setup.sh"
 if [ -e "$post_relocate" ]; then
 	$SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $post_relocate
 	$SUDO_EXEC /bin/sh $post_relocate "$target_sdk_dir" "@SDKPATH@"
+	if [ $? -ne 0 ]; then
+		echo "Executing $post_relocate failed"
+		exit 1
+	fi
 	$SUDO_EXEC rm -f $post_relocate
 fi
 
Signature · 1 line
2.34.1
#13 lore raw

PATCH 13/31 virglrenderer: Add patch to fix -int-conversion build issue

In reply to Steve Sakoman

From: Purushottam Choudhary <[email protected]>

Fix int conversion related error during compilation as some of the platforms where EGLNativeDisplayType is an int instead of a pointer with GCC-14.

(cherry picked from commit f71f4936a273262343e34f278e6cfcc1e419aea3)
---
 ...nversion-fatal-build-error-with-GCC-.patch | 41 +++++++++++++++++++
 .../virglrenderer/virglrenderer_1.0.1.bb      |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch
meta/recipes-graphics/virglrenderer/virglrenderer/0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch new file +41 -0
new file mode 100644
index 0000000000..9c49ee512a
@@ -0,0 +1,41 @@
+From 464deabe4d1bfce6b8f414ab0945d9a62b66ddd4 Mon Sep 17 00:00:00 2001
+From: Purushottam Choudhary <[email protected]>
+Date: Tue, 8 Oct 2024 11:47:21 +0530
+Subject: [PATCH] vrend: Fix int-conversion fatal build error with GCC-14
+
+Getting below error int conversion during compilation as one the
+platforms where EGLNativeDisplayType is an int instead of a pointer.
+
+| ../git/src/vrend_winsys_egl.c: In function 'virgl_egl_init':
+| ../git/src/vrend_winsys_egl.c:364:62: error: passing argument 2 of 'egl->funcs.epoxy_eglGetPlatformDisplay' makes pointer from
+|   364 |                                                              (EGLNativeDisplayType)egl->gbm->device, NULL);
+|       |                                                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|       |                                                              |
+|       |                                                              int
+| ../git/src/vrend_winsys_egl.c:364:62: note: expected 'void *' but argument is of type 'int'
+
+Upstream-Status: Backport [https://gitlab.freedesktop.org/virgl/virglrenderer/-/commit/464deabe4d1bfce6b8f414ab0945d9a62b66ddd4]
+
+Signed-off-by: Purushottam Choudhary <[email protected]>
+Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1440>
+---
+
+ src/vrend_winsys_egl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vrend_winsys_egl.c b/src/vrend_winsys_egl.c
+index 9d9f410c..8750f6b2 100644
+--- a/src/vrend_winsys_egl.c
++++ b/src/vrend_winsys_egl.c
+@@ -361,7 +361,7 @@ struct virgl_egl *virgl_egl_init(EGLNativeDisplayType display_id, bool surfacele
+ #ifdef ENABLE_GBM
+       else
+          egl->egl_display = egl->funcs.eglGetPlatformDisplay(EGL_PLATFORM_GBM_KHR,
+-                                                             (EGLNativeDisplayType)egl->gbm->device, NULL);
++                                                             (EGLNativeDisplayType*)egl->gbm->device, NULL);
+ #endif
+    } else {
+ #ifdef ENABLE_GBM
+-- 
+2.34.1
+
meta/recipes-graphics/virglrenderer/virglrenderer_1.0.1.bb +1 -0
index 0501b0c59c..87f25a3461 100644
@@ -12,6 +12,7 @@ DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm"
 SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868"
 SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \
            file://0001-meson.build-use-python3-directly-for-python.patch \
+           file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.34.1
#14 lore raw

PATCH 14/31 oeqa/runtime/ssh: Rework ssh timeout

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

After the changes to improve this test, we keep seeing image testing ssh failures, particularly on mips.

It looks like part of the problem is that on a loaded system, 5s is too short for mips to reliably establish an ssh connection. I've seen logs where it keeps timing out and fails to work, then the debug code successfully uses ssh later after everything else fails.

Change the timings/retries to give slow platforms enough time to respond.

(cherry picked from commit ba64ccf3ad6e40461219b72d60eb0fe5cb38fddd)
---
 meta/lib/oeqa/runtime/cases/ssh.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +2 -2
index b86428002f..f5b76edff4 100644
@@ -16,7 +16,7 @@ class SSHTest(OERuntimeTestCase):
     @OETestDepends(['ping.PingTest.test_ping'])
     @OEHasPackage(['dropbear', 'openssh-sshd'])
     def test_ssh(self):
-        for i in range(20):
+        for i in range(5):
           status, output = self.target.run("uname -a", timeout=5)
           if status == 0:
               break
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase):
               # give it time for the port to open.
               # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely
               # from boot/init not being 100% complete, retry for these too.
-              time.sleep(5)
+              time.sleep(30)
               continue
           else:
               self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
Signature · 1 line
2.34.1
#15 lore raw

PATCH 15/31 oeqa/runtime/ssh: Fix incorrect timeout fix

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

I'd meant to change the command timeout in the previous change, fix the correct one.

(cherry picked from commit bb991988cb23be2c8947171726ada321f27e6eed)
---
 meta/lib/oeqa/runtime/cases/ssh.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +2 -2
index f5b76edff4..89d64430e5 100644
@@ -17,7 +17,7 @@ class SSHTest(OERuntimeTestCase):
     @OEHasPackage(['dropbear', 'openssh-sshd'])
     def test_ssh(self):
         for i in range(5):
-          status, output = self.target.run("uname -a", timeout=5)
+          status, output = self.target.run("uname -a", timeout=30)
           if status == 0:
               break
           elif status == 255 or status == -signal.SIGTERM:
@@ -29,7 +29,7 @@ class SSHTest(OERuntimeTestCase):
               # give it time for the port to open.
               # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely
               # from boot/init not being 100% complete, retry for these too.
-              time.sleep(30)
+              time.sleep(5)
               continue
           else:
               self.fail("uname failed with \"%s\" (exit code %s)" % (output, status))
Signature · 1 line
2.34.1
#16 lore raw

PATCH 16/31 cml1.bbclass: do_diffconfig: Don't override .config with .config.orig

In reply to Steve Sakoman

From: Robert Yang <[email protected]>

Fixed:
1) $ bitbake virtual/kernel -cmenuconfig
Do some changes and save the new config to default .config.
2) $ bitbake virtual/kernel -cdiffconfig
The config fragment is dumped into ${WORKDIR}/fragment.cfg.

But the .config which was saved by step #1 is overridden by .config.orig, so the changes will be lost if run 'bitbake virtual/kernel'

And the following comment is for subprocess.call(), not for shutil.copy(), so move subprocess.call() to the correct location.
# No need to check the exit code as we know it's going to be # non-zero, but that's what we expect.

(cherry picked from commit 6cccf6b02f92dad514e65fd779ff659b19eb6be7)
---
 meta/classes-recipe/cml1.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/classes-recipe/cml1.bbclass +1 -2
index 8c207daec4..0bf171a668 100644
@@ -93,10 +93,9 @@ python do_diffconfig() {
 
     if isdiff:
         statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L" ' + configorig + ' ' + config + '>' + fragment
-        subprocess.call(statement, shell=True)
         # No need to check the exit code as we know it's going to be
         # non-zero, but that's what we expect.
-        shutil.copy(configorig, config)
+        subprocess.call(statement, shell=True)
 
         bb.plain("Config fragment has been dumped into:\n %s" % fragment)
     else:
Signature · 1 line
2.34.1
#17 lore raw

PATCH 17/31 package_rpm: Check if file exists before open()

In reply to Steve Sakoman

From: Pavel Zhukov <[email protected]>

Exception handler tries to read() /etc/passwd file in sysroot and if file doesn't exist for any reason then it raises FileNotFoundError exception which mask the original source of the problem and makes debugging of the issue more difficult.

Fixes:
Exception: FileNotFoundError: [Errno 2] No such file or directory:
'/codebuild/output/src1899304708/src/build/tmp-container/work/core2-64-oe-linux/emqx-bin/4.3.12/recipe-sysroot/etc/passwd'

(cherry picked from commit 4ad9a0e0b11eb7bc5a3dd45fc8945e094ea949e9)
---
 meta/classes-global/package_rpm.bbclass | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
meta/classes-global/package_rpm.bbclass +12 -4
index 474d2491eb..ddc4bf3a6a 100644
@@ -201,14 +201,22 @@ python write_specfile () {
                 try:
                     owner = pwd.getpwuid(stat_f.st_uid).pw_name
                 except Exception as e:
-                    bb.error("Content of /etc/passwd in sysroot:\n{}".format(
-                        open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read()))
+                    filename = d.getVar('RECIPE_SYSROOT') + '/etc/passwd'
+                    if os.path.exists(filename):
+                        bb.error("Content of /etc/passwd in sysroot:\n{}".format(
+                            open(filename).read()))
+                    else:
+                        bb.error("File {} doesn't exist in sysroot!".format(filename))
                     raise e
                 try:
                     group = grp.getgrgid(stat_f.st_gid).gr_name
                 except Exception as e:
-                    bb.error("Content of /etc/group in sysroot:\n{}".format(
-                        open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read()))
+                    filename = d.getVar("RECIPE_SYSROOT") +"/etc/group"
+                    if os.path.exists(filename):
+                        bb.error("Content of /etc/group in sysroot:\n{}".format(
+                            open(filename).read()))
+                    else:
+                        bb.error("File {} doesn't exists in sysroot!".format(filename))
                     raise e
                 return "%attr({:o},{},{}) ".format(mode, owner, group)
 
Signature · 1 line
2.34.1
#18 lore raw

PATCH 18/31 lib/oe/package-manager: skip processing installed-pkgs with empty globs

In reply to Steve Sakoman

From: Claus Stovgaard <[email protected]>

We can skip processing the installed-pkgs file if globs is empty. This is the case if self.d.getVar for IMAGE_INSTALL_COMPLEMENTARY returns an empty string. If globs is an empty string the result from processing with empty glob in oe-pkgdata-util will always be 0 packages to install.

Instead of return early on this we just skip and still generate the locale archive if needed.

(cherry picked from commit 160c45c83d5addf01e4834cf896af871bd6fca7f)
---
 meta/lib/oe/package_manager/__init__.py | 76 ++++++++++++-------------
 1 file changed, 37 insertions(+), 39 deletions(-)
meta/lib/oe/package_manager/__init__.py +37 -39
index d3b2317894..2100a97c12 100644
@@ -365,45 +365,43 @@ class PackageManager(object, metaclass=ABCMeta):
                 for complementary_linguas in (self.d.getVar('IMAGE_LINGUAS_COMPLEMENTARY') or "").split():
                     globs += (" " + complementary_linguas) % lang
 
-        if globs is None:
-            return
-
-        # we need to write the list of installed packages to a file because the
-        # oe-pkgdata-util reads it from a file
-        with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs:
-            pkgs = self.list_installed()
-
-            provided_pkgs = set()
-            for pkg in pkgs.values():
-                provided_pkgs |= set(pkg.get('provs', []))
-
-            output = oe.utils.format_pkg_list(pkgs, "arch")
-            installed_pkgs.write(output)
-            installed_pkgs.flush()
-
-            cmd = ["oe-pkgdata-util",
-                   "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name,
-                   globs]
-            exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY')
-            if exclude:
-                cmd.extend(['--exclude=' + '|'.join(exclude.split())])
-            try:
-                bb.note('Running %s' % cmd)
-                proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                stdout, stderr = proc.communicate()
-                if stderr: bb.note(stderr.decode("utf-8"))
-                complementary_pkgs = stdout.decode("utf-8")
-                complementary_pkgs = set(complementary_pkgs.split())
-                skip_pkgs = sorted(complementary_pkgs & provided_pkgs)
-                install_pkgs = sorted(complementary_pkgs - provided_pkgs)
-                bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % (
-                    ' '.join(install_pkgs),
-                    ' '.join(skip_pkgs)))
-                self.install(install_pkgs, hard_depends_only=True)
-            except subprocess.CalledProcessError as e:
-                bb.fatal("Could not compute complementary packages list. Command "
-                         "'%s' returned %d:\n%s" %
-                         (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
+        if globs:
+            # we need to write the list of installed packages to a file because the
+            # oe-pkgdata-util reads it from a file
+            with tempfile.NamedTemporaryFile(mode="w+", prefix="installed-pkgs") as installed_pkgs:
+                pkgs = self.list_installed()
+
+                provided_pkgs = set()
+                for pkg in pkgs.values():
+                    provided_pkgs |= set(pkg.get('provs', []))
+
+                output = oe.utils.format_pkg_list(pkgs, "arch")
+                installed_pkgs.write(output)
+                installed_pkgs.flush()
+
+                cmd = ["oe-pkgdata-util",
+                    "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name,
+                    globs]
+                exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY')
+                if exclude:
+                    cmd.extend(['--exclude=' + '|'.join(exclude.split())])
+                try:
+                    bb.note('Running %s' % cmd)
+                    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                    stdout, stderr = proc.communicate()
+                    if stderr: bb.note(stderr.decode("utf-8"))
+                    complementary_pkgs = stdout.decode("utf-8")
+                    complementary_pkgs = set(complementary_pkgs.split())
+                    skip_pkgs = sorted(complementary_pkgs & provided_pkgs)
+                    install_pkgs = sorted(complementary_pkgs - provided_pkgs)
+                    bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % (
+                        ' '.join(install_pkgs),
+                        ' '.join(skip_pkgs)))
+                    self.install(install_pkgs, hard_depends_only=True)
+                except subprocess.CalledProcessError as e:
+                    bb.fatal("Could not compute complementary packages list. Command "
+                            "'%s' returned %d:\n%s" %
+                            (' '.join(cmd), e.returncode, e.output.decode("utf-8")))
 
         if self.d.getVar('IMAGE_LOCALES_ARCHIVE') == '1':
             target_arch = self.d.getVar('TARGET_ARCH')
Signature · 1 line
2.34.1
#19 lore raw

PATCH 19/31 qemurunner: Clean up serial_lock handling

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Avoid "RuntimeError: release unlocked lock" since the lock shouldn't be locked even in the error path. Add a try/finally path to ensure this.

(cherry picked from commit b0732ee009ca47580d1d2ad75334f4aa50e6efd5)
---
 meta/lib/oeqa/utils/qemurunner.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
meta/lib/oeqa/utils/qemurunner.py +6 -5
index cda43aad8c..f1c2d2b5c9 100644
@@ -519,7 +519,6 @@ class QemuRunner:
                 except Exception as e:
                     self.logger.warning('Extra log data exception %s' % repr(e))
                     data = None
-            self.thread.serial_lock.release()
             return False
 
         with self.thread.serial_lock:
@@ -822,10 +821,12 @@ class LoggingThread(threading.Thread):
                     self.logfunc(data, ".stdout")
                 elif self.serialsock and self.serialsock.fileno() == fd:
                     if self.serial_lock.acquire(blocking=False):
-                        data = self.recv(1024, self.serialsock)
-                        self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace'))
-                        self.logfunc(data, ".2")
-                        self.serial_lock.release()
+                        try:
+                            data = self.recv(1024, self.serialsock)
+                            self.logger.debug("Data received serial thread %s" % data.decode('utf-8', 'replace'))
+                            self.logfunc(data, ".2")
+                        finally:
+                            self.serial_lock.release()
                     else:
                         serial_registered = False
                         poll.unregister(self.serialsock.fileno())
Signature · 1 line
2.34.1
#20 lore raw

PATCH 20/31 ovmf-native: remove .pyc files from install

In reply to Steve Sakoman

From: Mikko Rapeli <[email protected]>

They break builds which share sstate files on different machines and paths:

ERROR: ovmf-edk2-stable202408-r0 do_prepare_recipe_sysroot: Error executing a python function in exec_func_python() autogenerated:

The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_func_python() autogenerated', lineno: 2, function: <module>

     0001:
 *** 0002:extend_recipe_sysroot(d)
     0003:

File: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/classes-global/staging.bbclass', lineno: 624, function: extend_recipe_sysroot
0620:
0621: # Handle deferred binfiles
0622: for l in binfiles:
0623: (targetdir, dest) = binfiles[l]
*** 0624: staging_copyfile(l, targetdir, dest, postinsts, seendirs)
0625:
0626: bb.note("Installed into sysroot: %s" % str(msg_adding))
0627: bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists))
0628:
File: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/meta/classes-global/staging.bbclass', lineno: 165, function: staging_copyfile

     0161:        os.symlink(linkto, dest)
     0162:        #bb.warn(c)
     0163:    else:
     0164:        try:

*** 0165: os.link(c, dest)
0166: except OSError as err:
0167: if err.errno == errno.EXDEV:
0168: bb.utils.copyfile(c, dest)
0169: else:
Exception: FileExistsError: [Errno 17] File exists: '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-667282/tmp/sysroots-components/x86_64/ovmf-native/usr/bin/edk2_basetools/BaseTools/Source/Python/AutoGen/__pycache__/WorkspaceAutoGen.cpython-312.pyc' -> '/srv/pokybuild/yocto-worker/oe-selftest-fedora/build/build-st-667282/tmp/work/core2-64-poky-linux/ovmf/edk2-stable202408/recipe-sysroot-native/usr/bin/edk2_basetools/BaseTools/Source/Python/AutoGen/__pycache__/WorkspaceAutoGen.cpython-312.pyc'

(cherry picked from commit facd9e17fa53e2fb3a828b3f179cfb659be75d37)
---
 meta/recipes-core/ovmf/ovmf_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-core/ovmf/ovmf_git.bb +1 -0
index 085574c0cb..c86fc72d3e 100644
@@ -223,6 +223,7 @@ do_compile:class-target() {
 
 do_install:class-native() {
     install -d ${D}/${bindir}/edk2_basetools
+    find ${S}/BaseTools -name \*.pyc -exec rm -rf \{\} \;
     cp -r ${S}/BaseTools ${D}/${bindir}/${EDK_TOOLS_DIR}
 }
 
Signature · 1 line
2.34.1
#21 lore raw

PATCH 21/31 gcc-source: Fix racing on building gcc-source-14.2.0 and lib32-gcc-source-14.2.0

In reply to Steve Sakoman

From: Hongxu Jia <[email protected]>

While enabling multilib, build gcc-source-14.2.0 and lib32-gcc-source-14.2.0 at the same time:

    $ MACHINE = "qemux86-64"
    $ require conf/multilib.conf
    $ MULTILIBS = "multilib:lib32"
    $ DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
    $ bitbake gcc-source-14.2.0 lib32-gcc-source-14.2.0
    ...
    $ cat tmp-glibc/work-shared/gcc-14.2.0-r0.vr2401/temp/log.task_order
    20241012-064533.415426 do_recipe_qa (2688052): log.do_recipe_qa.2688052
    20241012-064533.463783 do_recipe_qa (2688051): log.do_recipe_qa.2688051
    20241012-064533.805164 do_fetch (2688257): log.do_fetch.2688257
    20241012-064533.852955 do_fetch (2688256): log.do_fetch.2688256
    20241012-064617.823714 do_unpack (2698542): log.do_unpack.2698542
    20241012-064617.871730 do_unpack (2698541): log.do_unpack.2698541
    ...

There are two tasks for do_fetch, do_unpack and others, so there are race issues.

Both of them have the same hardcode 'gcc' prefix in ${WORKDIR} and ${S}, explicitly disable lib32-gcc-source-14.2.0 for multilib

Set gcc-source as BPN of gcc-source-14.2.0

(cherry picked from commit 901c47877e0710af50639f688e0bfdb851b762b5)
---
 meta/conf/multilib.conf                      | 2 +-
 meta/recipes-devtools/gcc/gcc-source_14.2.bb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
meta/conf/multilib.conf +1 -1
index 09546315b8..7bdfcd56aa 100644
@@ -24,4 +24,4 @@ OPKG_ARGS:append = " --force-maintainer --force-overwrite"
 
 # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES
 # ${MLPREFIX}${BPN}
-NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot"
+NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot gcc-source"
meta/recipes-devtools/gcc/gcc-source_14.2.bb +1 -0
index b890fa33ea..be11fa2fcc 100644
@@ -1,4 +1,5 @@
 require recipes-devtools/gcc/gcc-${PV}.inc
 require recipes-devtools/gcc/gcc-source.inc
 
+BPN = "gcc-source"
 EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.34.1
#22 lore raw

PATCH 22/31 tcl: skip io-13.6 test case

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

---- Result was:
{abcdefghj
01234} 0
---- Result should have been (exact matching):
{abcdefghj
} 1 01234 0
==== io-13.6 FAILED

This test is documented as failing on slow machines, so just skip it.

[ YOCTO #15407 ]

(cherry picked from commit f69183586655294c9aed6687cebe57767c2f3eb8)
---
 meta/recipes-devtools/tcltk/tcl/run-ptest | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-devtools/tcltk/tcl/run-ptest +2 -0
index a403a74bb6..c485e535c7 100644
@@ -15,6 +15,8 @@ SKIP="$SKIP cmdMZ-6.6"
 SKIP="$SKIP exit-1.\*"
 # 15407 15421
 SKIP="$SKIP \*io-46.1"
+# io-13.6 explicitly says it can fail on slow/loaded machines
+SKIP="$SKIP io-13.6"
 # 14825
 SKIP="$SKIP socket-\* socket_inet-\*"
 
Signature · 1 line
2.34.1
#23 lore raw

PATCH 23/31 groff: fix rare build race in hdtbl

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

It's possible to build the hdtbl examples before grn has been build:

groff: error: couldn't exec grn: No such file or directory

Backport a dependency fix from upstream.

[ YOCTO #15610 ]

(cherry picked from commit d590a32423d05cefc4e7282f971f633b3fa0b941)
---
 ...l-Fix-Savannah-66316-missing-grn-dep.patch | 38 +++++++++++++++++++
 meta/recipes-extended/groff/groff_1.23.0.bb   |  1 +
 2 files changed, 39 insertions(+)
 create mode 100644 meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch
meta/recipes-extended/groff/files/0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch new file +38 -0
new file mode 100644
index 0000000000..d9455af2ac
@@ -0,0 +1,38 @@
+From 12169aa269341753d491a69e9adb86c58dca039a Mon Sep 17 00:00:00 2001
+From: "G. Branden Robinson" <[email protected]>
+Date: Thu, 10 Oct 2024 18:17:08 -0500
+Subject: [PATCH] [hdtbl]: Fix Savannah #66316 (missing `grn` dep).
+
+* hdtbl.am (HDTBLPROCESSEDEXAMPLEFILES): Declare dependency on `grn`;
+  because `-I` flags are used, it is dragged in even though not
+  explicitly needed.  Resolves race against `grn`'s availability in the
+  build tree.
+
+Fixes <https://savannah.gnu.org/bugs/?66316>.  Thanks to Ross Burton for
+the report.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <[email protected]>
+---
+ contrib/hdtbl/ChangeLog | 10 ++++++++++
+ contrib/hdtbl/hdtbl.am  |  3 +--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
+index b6c334c18..3c37174f2 100644
+--- a/contrib/hdtbl/hdtbl.am
++++ b/contrib/hdtbl/hdtbl.am
+@@ -119,9 +119,8 @@ SUFFIXES += .roff .in .ps
+ 	&& sed -e "s|[@]fontdir[@]|$(fontdir)|" \
+ 	       -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
+ 
+-
+ $(HDTBLPROCESSEDEXAMPLEFILES): $(DOC_GNU_EPS) groff troff eqn pic tbl \
+-  grops font/devps/stamp contrib/hdtbl/examples/common.roff
++  grops grn font/devps/stamp contrib/hdtbl/examples/common.roff
+ 
+ uninstall_groffdirs: uninstall-hdtbl-hook
+ uninstall-hdtbl-hook:
+-- 
+2.34.1
+
meta/recipes-extended/groff/groff_1.23.0.bb +1 -0
index 0fc4f831d8..8a16321479 100644
@@ -12,6 +12,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \
            file://0001-Make-manpages-mulitlib-identical.patch \
            file://0001-build-Fix-Savannah-64681-webpage.ps-deps.patch \
            file://0001-build-meintro_fr.ps-depends-on-tbl.patch \
+           file://0001-hdtbl-Fix-Savannah-66316-missing-grn-dep.patch \
            "
 
 SRC_URI[sha256sum] = "6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13"
Signature · 1 line
2.34.1
#24 lore raw

PATCH 24/31 util-linux: Add `findmnt` to the bash completion RDEPENDS

In reply to Steve Sakoman

From: Alban Bedel <[email protected]>

The bash completion scripts for umount, fstrim and fsfreeze make use of findmnt so add it to the bash completion RDEPENDS.

(cherry picked from commit f8703b486a6ccf39225815362acadafb890ca56e)
---
 meta/recipes-core/util-linux/util-linux_2.40.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux_2.40.2.bb +1 -1
index a8e346539a..646bc05564 100644
@@ -148,7 +148,7 @@ RDEPENDS:${PN}-dev += " util-linux-libuuid-dev"
 
 RPROVIDES:${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev"
 
-RDEPENDS:${PN}-bash-completion += "${PN}-lsblk"
+RDEPENDS:${PN}-bash-completion += "${PN}-lsblk ${PN}-findmnt"
 RDEPENDS:${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod procps sed socat which xz diffutils"
 RRECOMMENDS:${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop kernel-module-algif-hash"
 RDEPENDS:${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff"
Signature · 1 line
2.34.1
#25 lore raw

PATCH 25/31 tune-cortexa32: set tune feature as armv8a

In reply to Steve Sakoman

From: Jagadeesh Krishnanjanappa <[email protected]>

Cortexa32 is a 32-bit armv8a architecture processor, so set the tune feature as armv8a instead of aarch64 which is 64-bit armv8a architecture.

It solves the following build error while compiling libgcc-initial
and libssp-nonshared.
-- snip --
aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfpu=neon' aarch64-poky-linux-musl-gcc: error: unrecognized command-line option '-mfloat-abi=hard' -- snip --

(cherry picked from commit 3b898270aca62559dfa42ed71d296fe8a8b46a41)
---
 meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/machine/include/arm/armv8a/tune-cortexa32.inc +1 -1
index 25bdf12b18..0eb938a240 100644
@@ -10,7 +10,7 @@ AVAILTUNES += "cortexa32 cortexa32-crypto"
 ARMPKGARCH:tune-cortexa32             = "cortexa32"
 ARMPKGARCH:tune-cortexa32-crypto      = "cortexa32"
 # We do not want -march since -mcpu is added above to cover for it
-TUNE_FEATURES:tune-cortexa32          = "aarch64 cortexa32 crc callconvention-hard neon"
+TUNE_FEATURES:tune-cortexa32          = "armv8a cortexa32 crc callconvention-hard neon"
 TUNE_FEATURES:tune-cortexa32-crypto   = "${TUNE_FEATURES:tune-cortexa32} crypto"
 PACKAGE_EXTRA_ARCHS:tune-cortexa32             = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc} cortexa32 cortexa32hf-neon"
 PACKAGE_EXTRA_ARCHS:tune-cortexa32-crypto      = "${PACKAGE_EXTRA_ARCHS:tune-armv8a-crc-crypto} cortexa32 cortexa32hf-neon cortexa32hf-neon-crypto"
Signature · 1 line
2.34.1
#26 lore raw

PATCH 26/31 libgfortran: fix buildpath QA issue

In reply to Steve Sakoman

From: Chen Qi <[email protected]>

The '-fdebug-prefix-map' options are used to map source files locations, otherwise, DW_AT_comp_dir will contain buildpath.

The '-gno-record-gcc-switches' option is used to fix the buildpath introduced
by '-fintrinsic-modules-path' option, which is automatically added by fortran.
Here's some output from 'readelf --debug-dump libgfortran.so.5.0.0' when this
option is not added:
"""
<0><1a37d3>: Abbrev Number: 4 (DW_TAG_compile_unit)
<1a37d4> DW_AT_producer : (indirect string, offset: 0xd653): GNU Fortran2008 14.2.0 -m64
-march=core2 -mtune=core2 -msse3
-mfpmath=sse -mshstk -g -O2 -O2 -fstack-protector-strong -fimplicit-none -fno-repack-arrays -fno-underscoring -fcf-protection=full -fallow-leading-underscore -fbuilding-libgfortran -fPIC -fintrinsic-modules-path /ala-lpggp72/qichen/Yocto/builds/build-poky/tmp/work/ core2-64-poky-linux/libgfortran/14.2.0/recipe-sysroot-native/usr/bin/x86_64-poky-linux /../../lib/x86_64-poky-linux/gcc/x86_64-poky-linux/14.2.0/finclude -fpre-include=../../../../recipe-sysroot/usr/include/finclude/math-vector-fortran.h
"""

See https://gcc.gnu.org/pipermail/fortran/2024-October/061204.html for more detailed information.

(cherry picked from commit 1eb084956bcba83782bc2b24cf8cc89459a57e34)
---
 meta/recipes-devtools/gcc/libgfortran.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/libgfortran.inc +1 -1
index c68645e392..2a08872c25 100644
@@ -8,7 +8,7 @@ EXTRA_OECONF_PATHS = "\
 # An arm hard float target like raspberrypi4 won't build
 # as CFLAGS don't make it to the fortran compiler otherwise
 # (the configure script sets FC to $GFORTRAN unconditionally)
-export GFORTRAN = "${FC}"
+export GFORTRAN = "${FC} -fcanon-prefix-map -fdebug-prefix-map=${S}=${TARGET_DBGSRC_DIR} -fdebug-prefix-map=${B}=${TARGET_DBGSRC_DIR} -gno-record-gcc-switches"
 
 do_configure () {
 	for target in libbacktrace libgfortran
Signature · 1 line
2.34.1
#27 lore raw

PATCH 27/31 python3-maturin: sort external libs in wheel files

In reply to Steve Sakoman

From: Yoann Congal <[email protected]>

Import a merged patch that sort external libs in the wheel file generated by maturin. That improve reproducibility.

CC Tim Orling <[email protected]>
(cherry picked from commit 66da28f85727206c0e647efba93c1be028519fe5)
---
 ...prove-wheel-reproducibility-by-sorti.patch | 55 +++++++++++++++++++
 .../python/python3-maturin_1.7.1.bb           |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch
meta/recipes-devtools/python/python3-maturin/0001-build_context-improve-wheel-reproducibility-by-sorti.patch new file +55 -0
new file mode 100644
index 0000000000..83b586ff72
@@ -0,0 +1,55 @@
+From 49b985d7f5a4582bf9e2c58b6220124e2b7aa395 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <[email protected]>
+Date: Thu, 17 Oct 2024 22:17:20 +0200
+Subject: [PATCH] build_context: improve wheel reproducibility by sorting libs
+ (#2261)
+
+OE-core note: Upstream does not have a commit message for this. Bellow
+is the message I've sent:
+> While tracking a reproducibility issue from maturin's output, we found
+> that the .so file in the output .whl were not ordered the same
+> every time.
+>
+> Order of the external libraries in the .whl comes down to the order
+> `soname_map` is iterated. But, `std::HashMap` does not provide a stable
+> order and that create an unstable order in the wheel.
+>
+> Switch to `std::BTreeMap` which keeps keys sorted and is iterable
+> in a stable order.
+>
+> This can be tested by building current python3-cryptography :
+>   SOURCE_DATE_EPOCH=1728915855 maturin build
+>
+> Before this commit, the above give two possible outputs (~50% each), the
+> difference is in the order of libssl and libcrypto.
+>
+> After this commit, the output is reproducible.
+
+Signed-off-by: Yoann Congal <[email protected]>
+Upstream-Status: Backport [https://github.com/PyO3/maturin/commit/61d54809776e1ca79ff8cc92387d70796d50c16e]
+---
+ src/build_context.rs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/build_context.rs b/src/build_context.rs
+index 2e498537..6fbd25c1 100644
+--- a/src/build_context.rs
++++ b/src/build_context.rs
+@@ -24,7 +24,7 @@ use normpath::PathExt;
+ use pep508_rs::Requirement;
+ use platform_info::*;
+ use sha2::{Digest, Sha256};
+-use std::collections::{HashMap, HashSet};
++use std::collections::{BTreeMap, HashSet};
+ use std::env;
+ use std::fmt::{Display, Formatter};
+ use std::io;
+@@ -396,7 +396,7 @@ impl BuildContext {
+         writer.add_directory(&libs_dir)?;
+ 
+         let temp_dir = tempfile::tempdir()?;
+-        let mut soname_map = HashMap::new();
++        let mut soname_map = BTreeMap::new();
+         let mut libs_copied = HashSet::new();
+         for lib in ext_libs.iter().flatten() {
+             let lib_path = lib.realpath.clone().with_context(|| {
meta/recipes-devtools/python/python3-maturin_1.7.1.bb +1 -0
index b9279f5ab5..8837128896 100644
@@ -12,6 +12,7 @@ SRC_URI:append = "\
     file://0003-Extract-extension-ABI-name-resolvation-code-as-helpe.patch \
     file://0004-Fix-cross-compilation-issue-with-linux-ppc-architect.patch \
     file://0005-Fix-cross-compilation-issue-with-linux-mips64-archit.patch \
+    file://0001-build_context-improve-wheel-reproducibility-by-sorti.patch \
 "
 
 S = "${WORKDIR}/maturin-${PV}"
Signature · 1 line
2.34.1
#28 lore raw

PATCH 28/31 udev-extraconf: fix network.sh script did not configure hotplugged interfaces

In reply to Steve Sakoman

From: Regis Dargent <[email protected]>

Udev script network.sh is called when a new ethernet interface is plugged (eg. USB). Due to some (old) missing files, this script does nothing, instead of configuring the interfaces with ifup.
I just commented the corresponding lines to allow the script to reach the part where it calls ifup.

Fixes [YOCTO 15616]

network.sh relies on (long) missing files (eg. /etc/network/options, /etc/init.d/network) to decide if it should configure the new network interface (ifup) or put its name in /etc/udev_network_queue for future initialization by /etc/init.d/network service.
The actual result was that the new hotplugged interface was never automatically configured.
Removing the obsolete tests allows the script to do its intended job.

(cherry picked from commit 160f7139172ffdf510a0d7d4e85f7fbaac7fd000)
---
 .../udev/udev-extraconf/network.sh            | 32 -------------------
 1 file changed, 32 deletions(-)
meta/recipes-core/udev/udev-extraconf/network.sh +0 -32
index 3ee92714af..ace38808cd 100644
@@ -6,38 +6,6 @@ echo "$INTERFACE" | grep -q wifi && exit 0
 # udevd does clearenv(). Export shell PATH to children.
 export PATH
 
-# Check if /etc/init.d/network has been run yet to see if we are 
-# called by starting /etc/rcS.d/S03udev and not by hotplugging a device
-#
-# At this stage, network interfaces should not be brought up
-# automatically because:
-# a)	/etc/init.d/network has not been run yet (security issue)
-# b) 	/var has not been populated yet so /etc/resolv,conf points to 
-#	oblivion, making the network unusable
-#
-
-spoofp="`grep ^spoofprotect /etc/network/options`"
-if test -z "$spoofp"
-then
-	# This is the default from /etc/init.d/network
-	spoofp_val=yes
-else
-	spoofp_val=${spoofp#spoofprotect=}
-fi
-
-test "$spoofp_val" = yes && spoofp_val=1 || spoofp_val=0
-
-# I think it is safe to assume that "lo" will always be there ;)
-if test "`cat /proc/sys/net/ipv4/conf/lo/rp_filter`" != "$spoofp_val" -a -n "$spoofp_val"
-then
-	echo "$INTERFACE" >> /dev/udev_network_queue	
-	exit 0
-fi
-
-#
-# Code taken from pcmcia-cs:/etc/pcmcia/network
-#
-
 # if this interface has an entry in /etc/network/interfaces, let ifupdown
 # handle it
 if grep -q "iface \+$INTERFACE" /etc/network/interfaces; then
Signature · 1 line
2.34.1
#29 lore raw

PATCH 29/31 weston: Add missing runtime dependency on freerdp

In reply to Steve Sakoman

From: Tom Hochstein <[email protected]>

With rdp enabled, nothing from freerdp is installed in the rootfs, and rdp is not usable. It seems there is no actual build time dependency other than the meson check itself, so add an explicit runtime dependency.

(cherry picked from commit 23271a1f908a223b4eb56d6034cbb1ac23da14fe)
---
 meta/recipes-graphics/wayland/weston_13.0.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/wayland/weston_13.0.3.bb +1 -1
index 19b242d01b..471dc52bb3 100644
@@ -62,7 +62,7 @@ PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libx
 # Headless Weston
 PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false"
 # Weston on RDP
-PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp"
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
 # VA-API desktop recorder
 PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva"
 # Weston with EGL support
Signature · 1 line
2.34.1
#30 lore raw

PATCH 30/31 glib-2.0: fix glib-2.0 ptest failure when upgrading tzdata2024b

In reply to Steve Sakoman

From: Jinfeng Wang <[email protected]>

Backport 3 patches [1][2][3] for gdatetime test to fix the ptest failure.

[1] https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf
[2] https://github.com/GNOME/glib/commit/30e9cfa5733003cd1079e0e9e8a4bff1a191171a
[3] https://github.com/GNOME/glib/commit/fe2699369f79981dcf913af4cfd98b342b84a9c1

(cherry picked from commit 0c8f87d5d4ec9f286b1e85d114cb9a728c1ff64b)
---
 .../files/gdatetime-test-fail-0001.patch      | 72 +++++++++++++++++++
 .../files/gdatetime-test-fail-0002.patch      | 65 +++++++++++++++++
 .../files/gdatetime-test-fail-0003.patch      | 63 ++++++++++++++++
 meta/recipes-core/glib-2.0/glib.inc           |  3 +
 4 files changed, 203 insertions(+)
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch
 create mode 100644 meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch
meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0001.patch new file +72 -0
new file mode 100644
index 0000000000..e78d96c3ce
@@ -0,0 +1,72 @@
+From 729d1cbcd599e848bee07c72a276ccc02a06ddc0 Mon Sep 17 00:00:00 2001
+From: "Rebecca N. Palmer" <[email protected]>
+Date: Fri, 11 Oct 2024 09:38:52 +0100
+Subject: [PATCH 1/3] gdatetime test: Do not assume PST8PDT was always exactly
+ -8/-7
+
+In newer tzdata, it is an alias for America/Los_Angeles, which has a
+slightly different meaning: DST did not exist there before 1883. As a
+result, we can no longer hard-code the knowledge that interval 0 is
+standard time and interval 1 is summer time, and instead we need to look
+up the correct intervals from known timestamps.
+
+Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/3502
+Bug-Debian: https://bugs.debian.org/1084190
+[smcv: expand commit message, fix whitespace]
+Signed-off-by: Simon McVittie <[email protected]>
+
+Upstream-Status: Backport
+[https://github.com/GNOME/glib/commit/c0619f08e6c608fd6464d2f0c6970ef0bbfb9ecf]
+
+Signed-off-by: Jinfeng Wang <[email protected]>
+---
+ glib/tests/gdatetime.c | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
+index d46f653ac..2eefc4106 100644
+--- a/glib/tests/gdatetime.c
++++ b/glib/tests/gdatetime.c
+@@ -2930,6 +2930,7 @@ test_posix_parse (void)
+ {
+   GTimeZone *tz;
+   GDateTime *gdt1, *gdt2;
++  gint i1, i2;
+ 
+   /* Check that an unknown zone name falls back to UTC. */
+   G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+@@ -2953,16 +2954,25 @@ test_posix_parse (void)
+ 
+ /* This fails rules_from_identifier on Unix (though not on Windows)
+  * but passes anyway because PST8PDT is a zone name.
++ *
++ * Intervals i1 and i2 (rather than 0 and 1) are needed because in
++ * recent tzdata, PST8PDT may be an alias for America/Los_Angeles,
++ * and hence be aware that DST has not always existed.
++ * https://bugs.debian.org/1084190
+  */
+   tz = g_time_zone_new_identifier ("PST8PDT");
+   g_assert_nonnull (tz);
+   g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "PST8PDT");
+-  g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 0), ==, "PST");
+-  g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, - 8 * 3600);
+-  g_assert (!g_time_zone_is_dst (tz, 0));
+-  g_assert_cmpstr (g_time_zone_get_abbreviation (tz, 1), ==, "PDT");
+-  g_assert_cmpint (g_time_zone_get_offset (tz, 1), ==,- 7 * 3600);
+-  g_assert (g_time_zone_is_dst (tz, 1));
++  /* a date in winter = non-DST */
++  i1 = g_time_zone_find_interval (tz, G_TIME_TYPE_STANDARD, 0);
++  /* approximately 6 months in seconds, i.e. a date in summer = DST */
++  i2 = g_time_zone_find_interval (tz, G_TIME_TYPE_DAYLIGHT, 15000000);
++  g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i1), ==, "PST");
++  g_assert_cmpint (g_time_zone_get_offset (tz, i1), ==, - 8 * 3600);
++  g_assert (!g_time_zone_is_dst (tz, i1));
++  g_assert_cmpstr (g_time_zone_get_abbreviation (tz, i2), ==, "PDT");
++  g_assert_cmpint (g_time_zone_get_offset (tz, i2), ==,- 7 * 3600);
++  g_assert (g_time_zone_is_dst (tz, i2));
+   g_time_zone_unref (tz);
+ 
+   tz = g_time_zone_new_identifier ("PST8PDT6:32:15");
+-- 
+2.34.1
+
meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0002.patch new file +65 -0

65 lines not on this page · raw message

meta/recipes-core/glib-2.0/files/gdatetime-test-fail-0003.patch new file +63 -0

63 lines not on this page · raw message

meta/recipes-core/glib-2.0/glib.inc +3 -0
index 9e742c4d3b..6ab52481b1 100644
@@ -226,6 +226,9 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-meson-Run-atomics-test-on-clang-as-well.patch \
            file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \
            file://skip-timeout.patch \
+           file://gdatetime-test-fail-0001.patch \
+           file://gdatetime-test-fail-0002.patch \
+           file://gdatetime-test-fail-0003.patch \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch \ 
                                 file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \
Signature · 1 line
2.34.1
#31 lore raw

PATCH 31/31 e2fsprogs: removed 'sed -u' option

In reply to Steve Sakoman

From: Aditya Tayade <[email protected]>

In embedded box, sed might be provided another providers like Busybox, hence use generic options whenever possible.
/bin/sed -> /etc/alternatives/sed
/etc/alternatives/sed -> /bin/busybox.nosuid

Here used 'sed -u' option is not necessary, hence removed it.

Fixes below error:
sed: invalid option -- 'u'

Also added 'set -eux' option which halts execution of the script on any failures.

(cherry picked from commit 07caee1829d2a61bc018fe0e37ecd482922179ee)
---
 meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +2 -1
index 279923db8e..1857a17189 100644
@@ -1,7 +1,8 @@
 #!/bin/sh
 
+set -eux
 cd ./test
-SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
+SKIP_SLOW_TESTS=yes ./test_script | sed -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /'
 rm -rf /var/volatile/tmp/*e2fsprogs*
 rm -f tmp-*
 rm -f *.tmp
Signature · 1 line
2.34.1