Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 28 messages Jul 14, 2024 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for scarthgap and have comments back by end of day Tuesday, July 16

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7136

The following changes since commit d511c41dac048fbdd93a54136e93b0623a18a83d:

xz: Update LICENSE variable for xz packages (2024-07-08 05:40:28 -0700)

are available in the Git repository at:

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

Alexander Kanavin (6):
mesa: remove obsolete
0001-meson.build-check-for-all-linux-host_os-combinations.patch
kexec-tools: submit
0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch upstream
vorbis: mark patch as Inactive-Upstream
grub: mark grub-module-explicitly-keeps-symbole-.module_license.patch
as a workaround
perl: submit the rest of determinism.patch upstream
iptables: submit
0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream

Changqing Li (2):
webkitgtk: fix do_configure error on beaglebone-yocto
webkitgtk: fix do_compile errors on beaglebone-yocto

Enrico Jörns (1):
wic: engine.py: use raw string for escape sequence

Hitendra Prajapati (1):
ruby: fix CVE-2024-27281

Jookia (1):
populate_sdk_ext.bbclass: Fix undefined variable error

Khem Raj (1):
linux-yocto: Enable team net driver

Niko Mauno (1):
dnf/mesa: Fix missing leading whitespace with ':append'

Peter Marko (1):
ncurses: switch to new mirror

Richard Purdie (2):
selftest/cases/runtime_test: Exclude centos-9 from virgl tests
cve-exclusion: Drop the version comparision/warning

Robert Kovacsics (1):
sdk: Fix path length limit to match reserved size

Ross Burton (6):
cpio: mark CVE-2023-7216 as disputed
fribidi: upgrade 1.0.13 -> 1.0.14
gstreamer1.0: skip another known flaky test
libportal: fix rare build race
meson: don't use deprecated pkgconfig variable
curl: skip FTP tests in run-ptest

Wang Mingyu (2):
ed: upgrade 1.20.1 -> 1.20.2
llvm: upgrade 18.1.5 -> 18.1.6

Yi Zhao (2):
libcap-ng: upgrade 0.8.4 -> 0.8.5
libcap-ng-python: upgrade 0.8.4 -> 0.8.5

 meta/classes-recipe/populate_sdk_ext.bbclass  |  2 +
 meta/files/toolchain-shar-extract.sh          |  4 +-
 meta/lib/oeqa/selftest/cases/runtime_test.py  |  2 +-
 ...icitly-keeps-symbole-.module_license.patch |  2 +-
 meta/recipes-core/meta/uninative-tarball.bb   |  2 +
 meta/recipes-core/ncurses/ncurses.inc         |  2 +-
 meta/recipes-core/ncurses/ncurses_6.4.bb      |  4 +-
 meta/recipes-devtools/dnf/dnf_4.19.0.bb       |  2 +-
 .../llvm/{llvm_18.1.5.bb => llvm_18.1.6.bb}   |  2 +-
 meta/recipes-devtools/meson/meson_1.3.1.bb    |  4 +-
 .../perl/files/determinism.patch              |  6 +-
 .../ruby/ruby/CVE-2024-27281.patch            | 97 +++++++++++++++++++
 meta/recipes-devtools/ruby/ruby_3.2.2.bb      |  1 +
 meta/recipes-extended/cpio/cpio_2.15.bb       |  1 +
 .../ed/{ed_1.20.1.bb => ed_1.20.2.bb}         |  2 +-
 ...ption-to-enable-disable-libnfnetlink.patch | 44 +++++----
 ...build-race-when-building-GTK-vapi-fi.patch | 49 ++++++++++
 .../libportal/libportal_0.7.1.bb              |  3 +-
 ...k-for-all-linux-host_os-combinations.patch | 42 --------
 meta/recipes-graphics/mesa/mesa.inc           |  3 +-
 ...Fix-add_buffer_phys_virt-align-issue.patch |  2 +-
 .../linux/cve-exclusion_6.6.inc               | 18 ++--
 meta/recipes-kernel/linux/linux-yocto_6.6.bb  |  2 +
 .../gstreamer/gstreamer1.0/run-ptest          |  9 +-
 .../0001-configure-Check-for-clang.patch      |  2 +-
 ...fic-declarations-in-FELighting.h-unn.patch | 44 +++++++++
 ...icDowncast-adoption-in-platform-code.patch | 65 +++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.44.1.bb  | 14 +--
 meta/recipes-support/curl/curl/run-ptest      |  4 +-
 .../{fribidi_1.0.13.bb => fribidi_1.0.14.bb}  |  2 +-
 ...hon-path-when-invoking-py-compile-54.patch | 34 +++++++
 .../files/fix-issues-with-swig-4-2.patch      | 32 ------
 ...hon_0.8.4.bb => libcap-ng-python_0.8.5.bb} |  0
 meta/recipes-support/libcap-ng/libcap-ng.inc  |  4 +-
 ...{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} |  0
 scripts/lib/wic/engine.py                     |  2 +-
 36 files changed, 369 insertions(+), 139 deletions(-)
 rename meta/recipes-devtools/llvm/{llvm_18.1.5.bb => llvm_18.1.6.bb} (98%)
 create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch
 rename meta/recipes-extended/ed/{ed_1.20.1.bb => ed_1.20.2.bb} (93%)
 create mode 100644 meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Remove-ARM-specific-declarations-in-FELighting.h-unn.patch
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0002-More-dynamicDowncast-adoption-in-platform-code.patch
 rename meta/recipes-support/fribidi/{fribidi_1.0.13.bb => fribidi_1.0.14.bb} (89%)
 create mode 100644 meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
 delete mode 100644 meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
 rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.4.bb => libcap-ng-python_0.8.5.bb} (100%)
 rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} (100%)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/27 cpio: mark CVE-2023-7216 as disputed

From: Ross Burton <[email protected]>

Upstream consider the behaviour described in this CVE as intentional, and provide an option to stop it.

(cherry picked from commit 6c99147037ba8ca424ee42520183bd2bd55c7056)
---
 meta/recipes-extended/cpio/cpio_2.15.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-extended/cpio/cpio_2.15.bb +1 -0
index 52070f59a2..95f82cdf3a 100644
@@ -16,6 +16,7 @@ SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee41834
 inherit autotools gettext texinfo ptest
 
 CVE_STATUS[CVE-2010-4226] = "not-applicable-platform: Issue applies to use of cpio in SUSE/OBS"
+CVE_STATUS[CVE-2023-7216] = "disputed: intended behaviour, see https://lists.gnu.org/archive/html/bug-cpio/2024-03/msg00000.html"
 
 EXTRA_OECONF += "DEFAULT_RMT_DIR=${sbindir}"
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/27 ruby: fix CVE-2024-27281

In reply to Steve Sakoman

From: Hitendra Prajapati <[email protected]>

References:
https://github.com/ruby/ruby/pull/10316
https://security-tracker.debian.org/tracker/CVE-2024-27281

Upstream-Status: Backport from https://github.com/ruby/rdoc/commit/da7a0c7553ef7250ca665a3fecdc01dbaacbb43d

---
 .../ruby/ruby/CVE-2024-27281.patch            | 97 +++++++++++++++++++
 meta/recipes-devtools/ruby/ruby_3.2.2.bb      |  1 +
 2 files changed, 98 insertions(+)
 create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch
meta/recipes-devtools/ruby/ruby/CVE-2024-27281.patch new file +97 -0
new file mode 100644
index 0000000000..f69f3bcf4f
@@ -0,0 +1,97 @@
+From da7a0c7553ef7250ca665a3fecdc01dbaacbb43d Mon Sep 17 00:00:00 2001
+From: Nobuyoshi Nakada <nobu@...>
+Date: Mon, 15 Apr 2024 11:40:00 +0000
+Subject: [PATCH] Filter marshaled objets
+
+CVE: CVE-2024-27281
+Upstream-Status: Backport [https://github.com/ruby/rdoc/commit/da7a0c7553ef7250ca665a3fecdc01dbaacbb43d]
+Signed-off-by: Hitendra Prajapati <[email protected]>
+---
+ lib/rdoc/store.rb | 45 ++++++++++++++++++++++++++-------------------
+ 1 file changed, 26 insertions(+), 19 deletions(-)
+
+diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
+index 9fc540d..5b663d7 100644
+--- a/lib/rdoc/store.rb
++++ b/lib/rdoc/store.rb
+@@ -556,9 +556,7 @@ class RDoc::Store
+   def load_cache
+     #orig_enc = @encoding
+ 
+-    File.open cache_path, 'rb' do |io|
+-      @cache = Marshal.load io
+-    end
++    @cache = marshal_load(cache_path)
+ 
+     load_enc = @cache[:encoding]
+ 
+@@ -615,9 +613,7 @@ class RDoc::Store
+   def load_class_data klass_name
+     file = class_file klass_name
+ 
+-    File.open file, 'rb' do |io|
+-      Marshal.load io
+-    end
++    marshal_load(file)
+   rescue Errno::ENOENT => e
+     error = MissingFileError.new(self, file, klass_name)
+     error.set_backtrace e.backtrace
+@@ -630,14 +626,10 @@ class RDoc::Store
+   def load_method klass_name, method_name
+     file = method_file klass_name, method_name
+ 
+-    File.open file, 'rb' do |io|
+-      obj = Marshal.load io
+-      obj.store = self
+-      obj.parent =
+-        find_class_or_module(klass_name) || load_class(klass_name) unless
+-          obj.parent
+-      obj
+-    end
++    obj = marshal_load(file)
++    obj.store = self
++    obj.parent ||= find_class_or_module(klass_name) || load_class(klass_name)
++    obj
+   rescue Errno::ENOENT => e
+     error = MissingFileError.new(self, file, klass_name + method_name)
+     error.set_backtrace e.backtrace
+@@ -650,11 +642,9 @@ class RDoc::Store
+   def load_page page_name
+     file = page_file page_name
+ 
+-    File.open file, 'rb' do |io|
+-      obj = Marshal.load io
+-      obj.store = self
+-      obj
+-    end
++    obj = marshal_load(file)
++    obj.store = self
++    obj
+   rescue Errno::ENOENT => e
+     error = MissingFileError.new(self, file, page_name)
+     error.set_backtrace e.backtrace
+@@ -976,4 +966,21 @@ class RDoc::Store
+     @unique_modules
+   end
+ 
++  private
++  def marshal_load(file)
++    File.open(file, 'rb') {|io| Marshal.load(io, MarshalFilter)}
++  end
++
++  MarshalFilter = proc do |obj|
++    case obj
++    when true, false, nil, Array, Class, Encoding, Hash, Integer, String, Symbol, RDoc::Text
++    else
++      unless obj.class.name.start_with("RDoc::")
++        raise TypeError, "not permitted class: #{obj.class.name}"
++      end
++    end
++    obj
++  end
++  private_constant :MarshalFilter
++
+ end
+-- 
+2.25.1
+
meta/recipes-devtools/ruby/ruby_3.2.2.bb +1 -0
index d1359e388c..5c2b07e5e4 100644
@@ -33,6 +33,7 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://0001-fiddle-Use-C11-_Alignof-to-define-ALIGN_OF-when-poss.patch \
            file://CVE-2023-36617_1.patch \
            file://CVE-2023-36617_2.patch \
+           file://CVE-2024-27281.patch \
            "
 UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
 
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/27 libcap-ng: upgrade 0.8.4 -> 0.8.5

In reply to Steve Sakoman

From: Yi Zhao <[email protected]>

Changelog:
https://people.redhat.com/sgrubb/libcap-ng/ChangeLog

- Remove python global exception handler since it's deprecated
- Make the utilities link against just built libraries
- Remove unused macro in cap-ng.h

Drop backport patch fix-issues-with-swig-4-2.patch. Backport a patch to fix build for libcap-ng-python.

(cherry picked from commit 0263fd8193e51e54a4598ea3811c3c0a6e781f85)
---
 ...hon-path-when-invoking-py-compile-54.patch | 34 +++++++++++++++++++
 .../files/fix-issues-with-swig-4-2.patch      | 32 -----------------
 meta/recipes-support/libcap-ng/libcap-ng.inc  |  4 +--
 ...{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} |  0
 4 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch
 delete mode 100644 meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch
 rename meta/recipes-support/libcap-ng/{libcap-ng_0.8.4.bb => libcap-ng_0.8.5.bb} (100%)
meta/recipes-support/libcap-ng/files/0001-Fix-python-path-when-invoking-py-compile-54.patch new file +34 -0
new file mode 100644
index 0000000000..a0452ad53d
@@ -0,0 +1,34 @@
+From 1fe7c1cfeea00ba4eb903fbb39b74361594d4835 Mon Sep 17 00:00:00 2001
+From: Jan Palus <[email protected]>
+Date: Wed, 10 Apr 2024 21:30:51 +0200
+Subject: [PATCH] Fix python path when invoking py-compile (#54)
+
+48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard
+AM_PATH_PYTHON macro. Makefile however still referred to old one.
+There's no need to set PYTHON explicitly anymore so drop it.
+
+Fixes #53
+
+Upstream-Status: Backport
+[https://github.com/stevegrubb/libcap-ng/commit/1fe7c1cfeea00ba4eb903fbb39b74361594d4835]
+
+Signed-off-by: Yi Zhao <[email protected]>
+---
+ bindings/python3/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/bindings/python3/Makefile.am b/bindings/python3/Makefile.am
+index 70a1dd8..6072fc2 100644
+--- a/bindings/python3/Makefile.am
++++ b/bindings/python3/Makefile.am
+@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES)
+ LIBS = ${top_builddir}/src/libcap-ng.la
+ SWIG_FLAGS = -python
+ SWIG_INCLUDES = ${AM_CPPFLAGS}
+-PYTHON = $(PYTHON3)
+ pyexec_PYTHON = capng.py
+ pyexec_LTLIBRARIES = _capng.la
+ pyexec_SOLIBRARIES = _capng.so
+-- 
+2.25.1
+
meta/recipes-support/libcap-ng/files/fix-issues-with-swig-4-2.patch deleted +0 -32
deleted file mode 100644
index fb424fe725..0000000000
@@ -1,32 +0,0 @@
-From 355eada2d20886287cffc16e304087dd6f66ae37 Mon Sep 17 00:00:00 2001
-From: Steve Grubb <[email protected]>
-Date: Thu, 4 Jan 2024 15:06:29 -0500
-Subject: [PATCH] Remove python global exception handler since its deprecated
-
-Upstream-Status: Backport [https://github.com/stevegrubb/libcap-ng/commit/30453b6553948cd05c438f9f509013e3bb84f25b]
-Signed-off-by: Anuj Mittal <[email protected]>
----
- bindings/src/capng_swig.i | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/bindings/src/capng_swig.i b/bindings/src/capng_swig.i
-index fcdaf18..fa85e13 100644
---- a/bindings/src/capng_swig.i
-+++ b/bindings/src/capng_swig.i
-@@ -30,13 +30,6 @@
- 
- %varargs(16, signed capability = 0) capng_updatev;
- 
--%except(python) {
--  $action
--  if (result < 0) {
--    PyErr_SetFromErrno(PyExc_OSError);
--    return NULL;
--  }
--}
- #endif
- 
- %define __signed__
--- 
-2.43.2
-
meta/recipes-support/libcap-ng/libcap-ng.inc +2 -2
index 845b7c2f0a..12b4002d11 100644
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
-           file://fix-issues-with-swig-4-2.patch \
+           file://0001-Fix-python-path-when-invoking-py-compile-54.patch \
            "
 
-SRC_URI[sha256sum] = "68581d3b38e7553cb6f6ddf7813b1fc99e52856f21421f7b477ce5abd2605a8a"
+SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff"
 
 EXTRA_OECONF:append:class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
 EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb renamed from meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb +0 -0
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng_0.8.4.bb
rename to meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/27 libcap-ng-python: upgrade 0.8.4 -> 0.8.5

In reply to Steve Sakoman

From: Yi Zhao <[email protected]>

Changelog:
https://people.redhat.com/sgrubb/libcap-ng/ChangeLog

- Remove python global exception handler since it's deprecated
- Make the utilities link against just built libraries
- Remove unused macro in cap-ng.h

(cherry picked from commit 98151fbd4864fb5c6728b7faed0ad83723f962ef)
---
 .../{libcap-ng-python_0.8.4.bb => libcap-ng-python_0.8.5.bb}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta/recipes-support/libcap-ng/{libcap-ng-python_0.8.4.bb => libcap-ng-python_0.8.5.bb} (100%)
meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb renamed from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb +0 -0
similarity index 100%
rename from meta/recipes-support/libcap-ng/libcap-ng-python_0.8.4.bb
rename to meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
Signature · 1 line
2.34.1
#5 lore raw

PATCH 5/27 fribidi: upgrade 1.0.13 -> 1.0.14

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

* Updated Unicode tables to version 15.1

(cherry picked from commit 332276679c9a004158929e03d9263e9ef66816e9)
---
 .../fribidi/{fribidi_1.0.13.bb => fribidi_1.0.14.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/fribidi/{fribidi_1.0.13.bb => fribidi_1.0.14.bb} (89%)
meta/recipes-support/fribidi/fribidi_1.0.14.bb renamed from meta/recipes-support/fribidi/fribidi_1.0.13.bb +1 -1
similarity index 89%
rename from meta/recipes-support/fribidi/fribidi_1.0.13.bb
rename to meta/recipes-support/fribidi/fribidi_1.0.14.bb
index 5d0476a375..51752096de 100644
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7"
 
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.xz \
            "
-SRC_URI[sha256sum] = "7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2"
+SRC_URI[sha256sum] = "76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a"
 
 inherit meson lib_package pkgconfig github-releases
 
Signature · 1 line
2.34.1
#6 lore raw

PATCH 6/27 ed: upgrade 1.20.1 -> 1.20.2

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

Changelog:
=============
- main_loop.c (command_s): Fix g/x/s/x/x, which failed to skip the final newline, printing lines twice.

(cherry picked from commit d726710f7b1d707a55777d486bf06b0021f9dcfb)
---
 meta/recipes-extended/ed/{ed_1.20.1.bb => ed_1.20.2.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/ed/{ed_1.20.1.bb => ed_1.20.2.bb} (93%)
meta/recipes-extended/ed/ed_1.20.2.bb renamed from meta/recipes-extended/ed/ed_1.20.1.bb +1 -1
similarity index 93%
rename from meta/recipes-extended/ed/ed_1.20.1.bb
rename to meta/recipes-extended/ed/ed_1.20.2.bb
index 9ae53002c3..2b78b080ba 100644
@@ -19,7 +19,7 @@ bindir = "${base_bindir}"
 SRC_URI = "${GNU_MIRROR}/ed/${BP}.tar.lz"
 UPSTREAM_CHECK_URI = "${GNU_MIRROR}/ed/"
 
-SRC_URI[sha256sum] = "b1a463b297a141f9876c4b1fcd01477f645cded92168090e9a35db2af4babbca"
+SRC_URI[sha256sum] = "65fec7318f48c2ca17f334ac0f4703defe62037bb13cc23920de077b5fa24523"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
Signature · 1 line
2.34.1
#7 lore raw

PATCH 7/27 llvm: upgrade 18.1.5 -> 18.1.6

In reply to Steve Sakoman

From: Wang Mingyu <[email protected]>

Changelog:
==========
- Fixes issues where LLVM is either generating the incorrect thunk for a function with aligned parameters or didn't correctly pass through the return value when StructRet was used.
- -Xclang -target-feature -Xclang +unaligned-scalar-mem can be used to enable unaligned scalar memory accesses for CPUs that do not support unaligned vector accesses. -mno-strict-align will enable unaligned scalar and vector memory accesses.
- Don't replace an aliasee with an alias that has weak linkage. This avoids incorrect linkage that can lead to using the wrong symbols during linking time.
- This patch fixes build failures when compiling AVX512 code using -march=native on machines without AVX512.
- Fixes crash in AArch64 backend when having true or false as operand for a fcmp instruction on IR level.
- Fixes compiler crash when user specifies -mno-evex512 with AVX512 features but no AVX512VL.
- Fixes a bug that tries to do VBROADCAST_LOAD for f16 without AVX2.

(cherry picked from commit 3cd5c40f5736506b2cfc23b180fa915b01d8220c)
---
 meta/recipes-devtools/llvm/{llvm_18.1.5.bb => llvm_18.1.6.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/llvm/{llvm_18.1.5.bb => llvm_18.1.6.bb} (98%)
meta/recipes-devtools/llvm/llvm_18.1.6.bb renamed from meta/recipes-devtools/llvm/llvm_18.1.5.bb +1 -1
similarity index 98%
rename from meta/recipes-devtools/llvm/llvm_18.1.5.bb
rename to meta/recipes-devtools/llvm/llvm_18.1.6.bb
index b03cf1465e..b2df5b60e3 100644
@@ -28,7 +28,7 @@ SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/
            file://0002-llvm-Fix-CVE-2024-0151.patch;striplevel=2 \
            file://llvm-config \
            "
-SRC_URI[sha256sum] = "3591a52761a7d390ede51af01ea73abfecc4b1d16445f9d019b67a57edd7de56"
+SRC_URI[sha256sum] = "bd4b4cb6374bcd5fc5a3ba60cb80425d29da34f316b8821abc12c0db225cf6b4"
 
 UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project"
 UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.34.1
#8 lore raw

PATCH 8/27 wic: engine.py: use raw string for escape sequence

In reply to Steve Sakoman

From: Enrico Jörns <[email protected]>

Fixes:

| poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/'

(cherry picked from commit e33d7241f6c2897e930aff41e18b154891197ab9)
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/engine.py +1 -1
index 674ccfc244..ce7e6c5d75 100644
@@ -359,7 +359,7 @@ class Disk:
         Remove files/dirs and their contents from the partition.
         This only applies to ext* partition.
         """
-        abs_path = re.sub('\/\/+', '/', path)
+        abs_path = re.sub(r'\/\/+', '/', path)
         cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs,
                                             self._get_part_image(pnum),
                                             abs_path)
Signature · 1 line
2.34.1
#9 lore raw

PATCH 9/27 gstreamer1.0: skip another known flaky test

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

The baseparse:parser_pull_short_read test is known to be unreliable, according to the list of known bad tests in gst-devtools.

Also clean up an incorrect comment.

(cherry picked from commit be58657b3ee32af5a00f6bfecb9264751915dabd)
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +7 -2
index 7d0312005f..ab2df80dcc 100755
@@ -1,11 +1,13 @@
 #! /bin/sh
 
-# Multiply all timeouts by ten so they're more likely to work
-# on a loaded system.
+# Multiply all timeouts by five so they're more likely to work
+# on a loaded system. The default timeout is 20s so this makes it
+# one minute.
 export CK_TIMEOUT_MULTIPLIER=5
 
 # Skip some tests that we know are problematic
 export GST_CHECKS_IGNORE=""
+
 # gstnetclientclock.c:test_functioning is very sensitive to load
 GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning"
 
@@ -13,4 +15,7 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning"
 # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/410
 GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live"
 
+# Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py:
+GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE:parser_pull_short_read"
+
 gnome-desktop-testing-runner gstreamer
Signature · 1 line
2.34.1
#10 lore raw

PATCH 10/27 libportal: fix rare build race

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

There is a build race where the libportal.vapi is not always generated before it is needed to build libportal-gtk*.vapi. Backport the fix from upstream.

[ YOCTO #15479 ]

(cherry picked from commit 2d984e52cded09647b210bd79cfec9deb4b7b589)
---
 ...build-race-when-building-GTK-vapi-fi.patch | 49 +++++++++++++++++++
 .../libportal/libportal_0.7.1.bb              |  3 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch
meta/recipes-gnome/libportal/files/0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch new file +49 -0
new file mode 100644
index 0000000000..fb015d3632
@@ -0,0 +1,49 @@
+From 26f96a178f8a0afded00bdd7238728c0b6e42a6b Mon Sep 17 00:00:00 2001
+From: Richard Purdie <[email protected]>
+Date: Thu, 9 May 2024 18:44:41 +0000
+Subject: [PATCH] meson.build: fix build race when building GTK vapi files
+
+There's a build race when building the GTK vapi files:
+
+FAILED: libportal/libportal-gtk4.vapi
+error: Package `libportal' not found in specified Vala API directories or GObject-Introspection GIR directories
+
+This can be verified by adding "sleep 10;" to the command for the
+libportal/libportal.vapi target in the generated build.ninja file.
+
+The GTK vapi files need to have access to the generic libportal.vapi file,
+but there is no explicit dependency.  Switch the dependency name 'libportal'
+to the dependency object libportal_vapi so that Meson generates the
+dependency correctly.
+
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <[email protected]>
+---
+ libportal/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libportal/meson.build b/libportal/meson.build
+index fff7603..4e67f40 100644
+--- a/libportal/meson.build
++++ b/libportal/meson.build
+@@ -168,7 +168,7 @@ if gtk3_dep.found()
+     if vapi
+       libportal_gtk3_vapi = gnome.generate_vapi('libportal-gtk3',
+         sources: libportal_gtk3_gir[0],
+-        packages: ['gio-2.0', 'gtk+-3.0', 'libportal'],
++        packages: ['gio-2.0', 'gtk+-3.0', libportal_vapi],
+         gir_dirs: [meson.current_build_dir()],
+         vapi_dirs: [meson.current_build_dir()],
+         install: true,
+@@ -227,7 +227,7 @@ if gtk4_dep.found()
+     if vapi
+       libportal_gtk4_vapi = gnome.generate_vapi('libportal-gtk4',
+         sources: libportal_gtk4_gir[0],
+-        packages: ['gio-2.0', 'gtk4', 'libportal'],
++        packages: ['gio-2.0', 'gtk4', libportal_vapi],
+         gir_dirs: [meson.current_build_dir()],
+         vapi_dirs: [meson.current_build_dir()],
+         install: true,
+-- 
+2.34.1
+
meta/recipes-gnome/libportal/libportal_0.7.1.bb +2 -1
index 22e45559c9..6ddfef76d3 100644
@@ -6,7 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
 
-SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
+SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main \
+           file://0001-meson.build-fix-build-race-when-building-GTK-vapi-fi.patch"
 SRCREV = "e9ed3a50cdde321eaf42361212480a66eb94a57a"
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.34.1
#11 lore raw

PATCH 11/27 linux-yocto: Enable team net driver

In reply to Steve Sakoman

From: Khem Raj <[email protected]>

Its needed to run libteam ptests

Cc Bruce Ashfield <[email protected]>
(cherry picked from commit 7cd8e04b23b562746665577174799d42ded45d93)
---
 meta/recipes-kernel/linux/linux-yocto_6.6.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-kernel/linux/linux-yocto_6.6.bb +2 -0
index ca7c4e978a..62c0f0ab36 100644
@@ -64,6 +64,8 @@ KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc features/nf_tables/nft_test.scc", "", d)}"
 KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc features/gpio/sim.scc", "", d)}"
+# libteam ptests from meta-oe needs it
+KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/net/team/team.scc", "", d)}"
 KERNEL_FEATURES:append:powerpc =" arch/powerpc/powerpc-debug.scc"
 KERNEL_FEATURES:append:powerpc64 =" arch/powerpc/powerpc-debug.scc"
 KERNEL_FEATURES:append:powerpc64le =" arch/powerpc/powerpc-debug.scc"
Signature · 1 line
2.34.1
#12 lore raw

PATCH 12/27 populate_sdk_ext.bbclass: Fix undefined variable error

In reply to Steve Sakoman

From: Jookia <[email protected]>

The variable uninative_checksum is returned without being set, causing a build error. Set it to None by default instead.

(cherry picked from commit 69ead1f2d403e6a0e5365ce4e89288f846d3ef33)
---
 meta/classes-recipe/populate_sdk_ext.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes-recipe/populate_sdk_ext.bbclass +2 -0
index f5687e5899..09d5e2aeb6 100644
@@ -276,6 +276,8 @@ def write_bblayers_conf(d, baseoutpath, sdkbblayers):
 def copy_uninative(d, baseoutpath):
     import shutil
 
+    uninative_checksum = None
+
     # Copy uninative tarball
     # For now this is where uninative.bbclass expects the tarball
     if bb.data.inherits_class('uninative', d):
Signature · 1 line
2.34.1
#13 lore raw

PATCH 13/27 sdk: Fix path length limit to match reserved size

In reply to Steve Sakoman

From: Robert Kovacsics <[email protected]>

There were two different interpreter lengths in use, make them match.

(cherry picked from commit b175f9cdc3d87bef5c89cc337c2a7e2674732b29)
---
 meta/files/toolchain-shar-extract.sh        | 4 +++-
 meta/recipes-core/meta/uninative-tarball.bb | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
meta/files/toolchain-shar-extract.sh +3 -1
index 4386b985bb..89d30005fd 100644
@@ -164,7 +164,9 @@ else
 fi
 
 # limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result.
-if [ ${#target_sdk_dir} -gt 2048 ]; then
+# This is due to ELF interpreter being set to 'a'*1024 in
+# meta/recipes-core/meta/uninative-tarball.bb
+if [ ${#target_sdk_dir} -gt 1024 ]; then
 	echo "Error: The target directory path is too long!!!"
 	exit 1
 fi
meta/recipes-core/meta/uninative-tarball.bb +2 -0
index 7eebcaf11a..0fd01fdb64 100644
@@ -58,6 +58,8 @@ fakeroot archive_sdk() {
 	DEST="./${SDK_ARCH}-${SDK_OS}"
 	mv sysroots/${SDK_SYS} $DEST
 	rm sysroots -rf
+	# There is a check in meta/files/toolchain-shar-extract.sh -- make sure to
+	# keep that check up to date if changing the `1024`
 	patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf
 	mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative
 	${SDK_ARCHIVE_CMD}
Signature · 1 line
2.34.1
#14 lore raw

PATCH 14/27 selftest/cases/runtime_test: Exclude centos-9 from virgl tests

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Similarly to centos 8, centos 9 doesn't support the render device we need for this test.

(cherry picked from commit c2be3afabf84f287c90b61ae2509728a6634fb8f)
---
 meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/runtime_test.py +1 -1
index 12000aac16..13aa5f16c9 100644
@@ -273,7 +273,7 @@ TEST_RUNQEMUPARAMS += " slirp"
         import subprocess, os
 
         distro = oe.lsb.distro_identifier()
-        if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'ubuntu-16.04', 'ubuntu-18.04'] or
+        if distro and (distro in ['debian-9', 'debian-10', 'centos-7', 'centos-8', 'centos-9', 'ubuntu-16.04', 'ubuntu-18.04'] or
             distro.startswith('almalinux') or distro.startswith('rocky')):
             self.skipTest('virgl headless cannot be tested with %s' %(distro))
 
Signature · 1 line
2.34.1
#15 lore raw

PATCH 15/27 ncurses: switch to new mirror

In reply to Steve Sakoman

From: Peter Marko <[email protected]>

github.com/mirror/ncurses is not updated for over a year. Switch to new mirror from Thomas Dickey (ncurses maintainer).

Sources are identical.

Updated upstream check regex by:
* changed dot to underscore as this repo is tagged like this
* added v prefix to not propose updates to some old tags
* removed third part to not propose updates to development snapshots

(cherry picked from commit ea801be31d051b558fde52f7d6dccf2cd416afb9)
---
 meta/recipes-core/ncurses/ncurses.inc    | 2 +-
 meta/recipes-core/ncurses/ncurses_6.4.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +1 -1
index 761b6a3d31..3b72f3efdd 100644
@@ -13,7 +13,7 @@ BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
 inherit autotools binconfig-disabled multilib_header pkgconfig
 
 # Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
-SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/ThomasDickey/ncurses-snapshots.git;protocol=https;branch=master"
 
 EXTRA_AUTORECONF = "-I m4"
 
meta/recipes-core/ncurses/ncurses_6.4.bb +2 -2
index 97130c06d6..61558ecfa8 100644
@@ -10,10 +10,10 @@ SRC_URI += "file://0001-tic-hang.patch \
            file://CVE-2023-45918.patch \
            "
 # commit id corresponds to the revision in package version
-SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f"
+SRCREV = "1003914e200fd622a27237abca155ce6bf2e6030"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
-UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$"
 
 # This is needed when using patchlevel versions like 6.1+20181013
 #CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"
Signature · 1 line
2.34.1
#16 lore raw

PATCH 16/27 meson: don't use deprecated pkgconfig variable

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

As with a previous change to the class[1], the "pkgconfig" entry is now deprecated and "pkg-config" should be used instead.

[1] oe-core d64b307891422e290bbe821d4303b3af526bbe17

(cherry picked from commit 3e441544f1aa7258718a1cadd6836d9cd9dc65ab)
---
 meta/recipes-devtools/meson/meson_1.3.1.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/meson/meson_1.3.1.bb +2 -2
index 9cc0cc31ab..f34af0e06d 100644
@@ -86,7 +86,7 @@ ar = ${@meson_array('BUILD_AR', d)}
 nm = ${@meson_array('BUILD_NM', d)}
 strip = ${@meson_array('BUILD_STRIP', d)}
 readelf = ${@meson_array('BUILD_READELF', d)}
-pkgconfig = 'pkg-config-native'
+pkg-config = 'pkg-config-native'
 
 [built-in options]
 c_args = ['-isystem@{OECORE_NATIVE_SYSROOT}${includedir_native}' , ${@var_list2str('BUILD_OPTIMIZATION', d)}]
@@ -104,7 +104,7 @@ cpp = @CXX
 ar = @AR
 nm = @NM
 strip = @STRIP
-pkgconfig = 'pkg-config'
+pkg-config = 'pkg-config'
 
 [built-in options]
 c_args = @CFLAGS
Signature · 1 line
2.34.1
#17 lore raw

PATCH 17/27 curl: skip FTP tests in run-ptest

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

It looks like something related to FTP in curl, be it the protocol itself or the harness, is unstable under load. We've been seeing random failures in automated QA, and Debian does too.

Until this issue is resolved, disable all of the FTP tests on the hope that this is the underlying common factor.

(cherry picked from commit 28035987fad5a673e35b346e043e66d04f64ef5d)
---
 meta/recipes-support/curl/curl/run-ptest | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-support/curl/curl/run-ptest +3 -1
index 3d25f3d90b..579b3f4587 100644
@@ -7,5 +7,7 @@ cd tests
 # Use automake-style output
 # Run four tests in parallel
 # Print log output on failure
+
 # Don't run the flaky or timing dependent tests
-./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent
+# Until https://github.com/curl/curl/issues/13350 is resolved, don't run FTP tests
+./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent !FTP
Signature · 1 line
2.34.1
#18 lore raw

PATCH 18/27 mesa: remove obsolete 0001-meson.build-check-for-all-linux-host_os-combinations.patch

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

The patch was submitted upstream
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28895
but further investigation revealed that the problem had been solved properly in meson.class:
https://git.yoctoproject.org/poky/commit/?id=6bf674374d568b2419a4c6eef00d893028878881

(cherry picked from commit 020345d63f0ffd3ed2b046bbb5e09b5359b24dd6)
---
 ...k-for-all-linux-host_os-combinations.patch | 42 -------------------
 meta/recipes-graphics/mesa/mesa.inc           |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted +0 -42
deleted file mode 100644
index 7be7d81eeb..0000000000
@@ -1,42 +0,0 @@
-From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <[email protected]>
-Date: Thu, 14 Nov 2019 13:04:49 -0800
-Subject: [PATCH] meson.build: check for all linux host_os combinations
-
-Make sure that we are also looking for our host_os combinations like
-linux-musl etc. when assuming support for DRM/KMS.
-
-Also delete a duplicate line.
-
-Upstream-Status: Pending
-
-Signed-off-by: Anuj Mittal <[email protected]>
-Signed-off-by: Fabio Berton <[email protected]>
-Signed-off-by: Otavio Salvador <[email protected]>
-Signed-off-by: Alistair Francis <[email protected]>
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 133fd9a..817861e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
- # Only build shared_glapi if at least one OpenGL API is enabled
- with_shared_glapi = with_shared_glapi and with_any_opengl
- 
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
- 
- gallium_drivers = get_option('gallium-drivers')
- if gallium_drivers.contains('auto')
-@@ -997,7 +997,7 @@ if cc.has_function('fmemopen')
- endif
- 
- # TODO: this is very incomplete
--if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system())
-+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
-   pre_args += '-D_GNU_SOURCE'
- elif host_machine.system() == 'sunos'
-   pre_args += '-D__EXTENSIONS__'
meta/recipes-graphics/mesa/mesa.inc +0 -1
index 77e9c80fcb..a8f3397e04 100644
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10
 PE = "2"
 
 SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
-           file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
            file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
            file://0001-drisw-fix-build-without-dri3.patch \
            file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
Signature · 1 line
2.34.1
#19 lore raw

PATCH 19/27 dnf/mesa: Fix missing leading whitespace with ':append'

In reply to Steve Sakoman

From: Niko Mauno <[email protected]>

Mitigate occurrences where ':append' operator is used and leading whitespace character is obviously missing, risking inadvertent string concatenation.

(From OE-Core rev: 314041fd126a4800a5a5d9fcd84c525319479256)

(cherry picked from commit 0b6ca9beeff927bbb6158c71596ac475550559d8)
---
 meta/recipes-devtools/dnf/dnf_4.19.0.bb | 2 +-
 meta/recipes-graphics/mesa/mesa.inc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/dnf/dnf_4.19.0.bb +1 -1
index 184dbea963..37a2cc7de2 100644
@@ -18,7 +18,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc
            file://0001-lock.py-fix-Exception-handling.patch \
            "
 
-SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch"
+SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch"
 
 SRCREV = "566a61f9d8a2830ac6dcc3a94c59224cef1c3d03"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
meta/recipes-graphics/mesa/mesa.inc +1 -1
index a8f3397e04..7cc48e8a04 100644
@@ -90,7 +90,7 @@ PACKAGECONFIG = " \
 	${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \
 "
 
-PACKAGECONFIG:append:class-native = "gallium-llvm r600"
+PACKAGECONFIG:append:class-native = " gallium-llvm r600"
 
 # "gbm" requires "opengl"
 PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
Signature · 1 line
2.34.1
#20 lore raw

PATCH 20/27 kexec-tools: submit 0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit d28861326dd8d23914571dc0be8e70899927deea)
---
 .../0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/kexec/kexec-tools/0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch +1 -1
index e874a8b4f1..489b109285 100644
@@ -8,7 +8,7 @@ is used by MMU, the "SECTION_SIZE" is defined with
 (1 << 21), but 'add_buffer_phys_virt()' hardcode this
 to (1 << 20).
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [via email to [email protected],http://lists.infradead.org/pipermail/kexec/2024-April/029903.html]
 
 Suggested-By:[email protected]
 Signed-off-by: Haiqing Bai <[email protected]>
Signature · 1 line
2.34.1
#21 lore raw

PATCH 21/27 vorbis: mark patch as Inactive-Upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 618bb8994d66d7d24cca2fb6885a510d69406437)
---
 .../libvorbis/libvorbis/0001-configure-Check-for-clang.patch    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-multimedia/libvorbis/libvorbis/0001-configure-Check-for-clang.patch +1 -1
index b06029b98b..d4fac605b6 100644
@@ -5,9 +5,9 @@ Subject: [PATCH] configure: Check for clang
 
 Disable gcc specific options if using clang
 
+Upstream-Status: Inactive-Upstream [https://gitlab.xiph.org/xiph/vorbis,https://github.com/xiph/vorbis]
 Signed-off-by: Khem Raj <[email protected]>
 ---
-Upstream-Status: Pending
 
  configure.ac | 19 +++++++++++++++++--
  1 file changed, 17 insertions(+), 2 deletions(-)
Signature · 1 line
2.34.1
#22 lore raw

PATCH 22/27 grub: mark grub-module-explicitly-keeps-symbole-.module_license.patch as a workaround

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 6307adb5b0644845f4062c21ac5717eb62a61dd3)
---
 .../grub-module-explicitly-keeps-symbole-.module_license.patch  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-bsp/grub/files/grub-module-explicitly-keeps-symbole-.module_license.patch +1 -1
index d9012d1dd6..7c8770ce8b 100644
@@ -37,7 +37,7 @@ SYMBOL TABLE:
 0000000000000000 l    d  .modname       0000000000000000 .modname
 --------------
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [workaround that needs investigation into @TARGET_STRIP@ behaviour in oe-core vs toolchain used by upstream]
 
 Signed-off-by: Hongxu Jia <[email protected]>
 
Signature · 1 line
2.34.1
#23 lore raw

PATCH 23/27 perl: submit the rest of determinism.patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 5c00500618fa50eeb5e3e956e1fb5f4af562c1a7)
---
 meta/recipes-devtools/perl/files/determinism.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/perl/files/determinism.patch +3 -3
index aa85ccef10..f2b1111552 100644
@@ -8,9 +8,9 @@ b) Sort the order of the module lists from configure_mods.sh since otherwise
    the result isn't the same leading to makefile differences.
    Reported upstream: https://github.com/arsv/perl-cross/issues/88
 
-c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst 
+c) Sort the Encode::Byte byte_t.fnm file output (and the makefile depends whilst
    there for good measure)
-   This needs to go to upstream perl (not done)
+   Submitted to upstream perl: https://github.com/dankogai/p5-encode/pull/179
 
 d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with bash
    and "" with dash
@@ -18,7 +18,7 @@ d) Use bash for perl-cross configure since otherwise trnl gets set to "\n" with
 
 RP 2020/2/7
 
-Upstream-Status: Pending [75% submitted]
+Upstream-Status: Submitted [see links above]
 Signed-off-by: Richard Purdie <[email protected]
 
 Index: perl-5.30.1/cpan/Encode/Byte/Makefile.PL
Signature · 1 line
2.34.1
#24 lore raw

PATCH 24/27 iptables: submit 0001-configure-Add-option-to-enable-disable-libnfnetlink.patch upstream

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

(cherry picked from commit 67f6c3534a18520f3b7c5eed27dc2744c5bf44c2)
---
 ...ption-to-enable-disable-libnfnetlink.patch | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)
meta/recipes-extended/iptables/iptables/0001-configure-Add-option-to-enable-disable-libnfnetlink.patch +26 -18
index 8824bf2af7..0fe2261511 100644
@@ -1,22 +1,24 @@
-From 0096c854d5015918ed154dccb3ad472fd06c1010 Mon Sep 17 00:00:00 2001
+From 653db8b938166db7833135f615b90c38a3f27a30 Mon Sep 17 00:00:00 2001
 From: "Maxin B. John" <[email protected]>
-Date: Tue, 21 Feb 2017 11:16:31 +0200
+Date: Thu, 25 Apr 2024 10:51:02 +0200
 Subject: [PATCH] configure: Add option to enable/disable libnfnetlink
 
-This changes the configure behaviour from autodetecting
-for libnfnetlink to having an option to disable it explicitly
-
-Upstream-Status: Pending
+Default behavior (autodetecting) does not change, but specifying
+either option would explicitly disable or enable libnfnetlink support,
+and if the library is not found in the latter case, ./configure will error
+out.
 
+Upstream-Status: Backport [https://git.netfilter.org/iptables/commit/?id=653db8b938166db7833135f615b90c38a3f27a30]
 Signed-off-by: Khem Raj <[email protected]>
 Signed-off-by: Maxin B. John <[email protected]>
-
+Signed-off-by: Alexander Kanavin <[email protected]>
+Signed-off-by: Phil Sutter <[email protected]>
 ---
- configure.ac | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ configure.ac | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index d99fa3b..d607772 100644
+index d99fa3b9..2293702b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -63,6 +63,9 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
@@ -25,21 +27,27 @@ index d99fa3b..d607772 100644
  	[enable_nftables="$enableval"], [enable_nftables="yes"])
 +AC_ARG_ENABLE([libnfnetlink],
 +    AS_HELP_STRING([--disable-libnfnetlink], [Do not use netfilter netlink library]),
-+    [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="yes"])
++    [enable_libnfnetlink="$enableval"], [enable_libnfnetlink="auto"])
  AC_ARG_ENABLE([connlabel],
  	AS_HELP_STRING([--disable-connlabel],
  	[Do not build libnetfilter_conntrack]),
-@@ -113,9 +116,10 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
+@@ -113,8 +116,14 @@ AM_CONDITIONAL([ENABLE_SYNCONF], [test "$enable_nfsynproxy" = "yes"])
  AM_CONDITIONAL([ENABLE_NFTABLES], [test "$enable_nftables" = "yes"])
  AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"])
  
 -PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
 -	[nfnetlink=1], [nfnetlink=0])
--AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
-+AS_IF([test "x$enable_libnfnetlink" = "xyes"], [
-+    PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0])
-+    ])
-+AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "x$enable_libnfnetlink" = "xyes"])
++# If specified explicitly on the command line, error out when library was not found
++# Otherwise, disable and continue
++AS_IF([test "x$enable_libnfnetlink" = "xyes"],
++	[PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
++			   [nfnetlink=1])],
++      [test "x$enable_libnfnetlink" = "xauto"],
++	[PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
++			   [nfnetlink=1], [nfnetlink=0])])
+ AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1])
  
  if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then
- 	PKG_CHECK_MODULES([libpcap], [libpcap], [], [
+-- 
+2.39.2
+
Signature · 1 line
2.34.1
#25 lore raw

PATCH 25/27 cve-exclusion: Drop the version comparision/warning

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Since the CVE repository is no longer being updated, drop the warning comparision since it is no longer valid.

---
 .../recipes-kernel/linux/cve-exclusion_6.6.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
meta/recipes-kernel/linux/cve-exclusion_6.6.inc +9 -9
index 9f1f03ac53..32a0701edf 100644
@@ -1,14 +1,14 @@
 
 # Auto-generated CVE metadata, DO NOT EDIT BY HAND.
-# Generated at 2024-05-02 12:41:43.351358+00:00 for version 6.6.29
-
-python check_kernel_cve_status_version() {
-    this_version = "6.6.29"
-    kernel_version = d.getVar("LINUX_VERSION")
-    if kernel_version != this_version:
-        bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
-}
-do_cve_check[prefuncs] += "check_kernel_cve_status_version"
+# Generated at 2024-06-06 20:41:33.044442+00:00 for version 6.6.32
+
+#python check_kernel_cve_status_version() {
+#    this_version = "6.6.29"
+#    kernel_version = d.getVar("LINUX_VERSION")
+#    if kernel_version != this_version:
+#        bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version))
+#}
+#do_cve_check[prefuncs] += "check_kernel_cve_status_version"
 
 CVE_STATUS[CVE-2003-1604] = "fixed-version: Fixed from version 2.6.12rc2"
 
Signature · 1 line
2.34.1
#26 lore raw

PATCH 26/27 webkitgtk: fix do_configure error on beaglebone-yocto

In reply to Steve Sakoman

From: Changqing Li <[email protected]>

* According to latest comment [1] and the mentioned pull request [2], build an ENABLE(WEBASSEMBLY) && !ENABLE(JIT) configuration is supported, so original issue already fixed in current version, the EXTRA_OECMAKE setting is not needed anymore.

* This EXTRA_OECMAKE setting causes following configure error on beaglebone-yocto, remove the setting to let the configure process decide the configuration:
CMake Error at Source/cmake/WebKitFeatures.cmake:312 (message):
ENABLE_JIT conflicts with ENABLE_C_LOOP. You must disable one or the other.

[YOCTO #15254]

[1] https://github.com/WebKit/WebKit/pull/17447
[2] https://github.com/WebKit/WebKit/pull/17688

---
 meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | 12 ------------
 1 file changed, 12 deletions(-)
meta/recipes-sato/webkit/webkitgtk_2.44.1.bb +0 -12
index 29e12bb8c5..14f7531549 100644
@@ -114,18 +114,6 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF "
 EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF "
 EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF "
 
-# And for armv7* don't enable it for softfp, because after:
-# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918
-# https://bugs.webkit.org/show_bug.cgi?id=242172
-# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets
-# explicitly disabled causing:
-# http://errors.yoctoproject.org/Errors/Details/734587/
-# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled
-# https://github.com/WebKit/WebKit/pull/17447
-EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
-EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
-EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
-
 EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF "
 EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF "
 
Signature · 1 line
2.34.1
#27 lore raw

PATCH 27/27 webkitgtk: fix do_compile errors on beaglebone-yocto

In reply to Steve Sakoman

From: Changqing Li <[email protected]>

Backport 2 patches to fix following compile errors:
webkitgtk-2.44.1/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNeonParallelApplier.cpp:545:37: error: 'LS_POINT' was not declared in this scope; did you mean 'WebCore::LightType::LS_POINT'?

  545 |     if (data.lightSource->type() == LS_POINT) {
      |                                     ^~~~~~~~
      |                                     WebCore::LightType::LS_POINT

webkitgtk-2.44.1/Source/WebCore/platform/graphics/filters/FELighting.h:73:41: error: 'LightingData' does not name a type
73 | inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);

---
 ...fic-declarations-in-FELighting.h-unn.patch | 44 +++++++++++++
 ...icDowncast-adoption-in-platform-code.patch | 65 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.44.1.bb  |  2 +
 3 files changed, 111 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Remove-ARM-specific-declarations-in-FELighting.h-unn.patch
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0002-More-dynamicDowncast-adoption-in-platform-code.patch
meta/recipes-sato/webkit/webkitgtk/0001-Remove-ARM-specific-declarations-in-FELighting.h-unn.patch new file +44 -0
new file mode 100644
index 0000000000..6ffe0a9454
@@ -0,0 +1,44 @@
+From dbd1a59b239b3902e717fdeb063883dbb0b06ee9 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <[email protected]>
+Date: Sun, 26 May 2024 14:24:35 -0700
+Subject: [PATCH 1/2] Remove ARM-specific declarations in FELighting.h unneeded
+ after 272873@main
+
+Unreviewed build fix.
+
+* Source/WebCore/platform/graphics/filters/FELighting.h: Remove unneeded
+  declarations for the getPowerCoefficients() and platformApplyNeon()
+  functions, which are now defined elsewhere; and were causing a build
+  failure due to usage of the protected LightingData type.
+
+Canonical link: https://commits.webkit.org/279334@main
+
+Backport this patch for fixing following compile error:
+webkitgtk-2.44.1/Source/WebCore/platform/graphics/filters/FELighting.h:73:41: error: 'LightingData' does not name a type 
+   73 |     inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
+
+Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/36d1b5d7c0ef9a733ee8055b1f35b1d24435d538]
+Signed-off-by: Changqing Li <[email protected]>
+---
+ Source/WebCore/platform/graphics/filters/FELighting.h | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h
+index 4efab920..dcd80b6f 100644
+--- a/Source/WebCore/platform/graphics/filters/FELighting.h
++++ b/Source/WebCore/platform/graphics/filters/FELighting.h
+@@ -68,11 +68,6 @@ protected:
+ 
+     std::unique_ptr<FilterEffectApplier> createSoftwareApplier() const override;
+ 
+-#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE)
+-    static int getPowerCoefficients(float exponent);
+-    inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&);
+-#endif
+-
+     Color m_lightingColor;
+     float m_surfaceScale;
+     float m_diffuseConstant;
+-- 
+2.25.1
+
meta/recipes-sato/webkit/webkitgtk/0002-More-dynamicDowncast-adoption-in-platform-code.patch new file +65 -0

65 lines not on this page · raw message

meta/recipes-sato/webkit/webkitgtk_2.44.1.bb +2 -0
index 14f7531549..c4a3c464c1 100644
@@ -16,6 +16,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://no-musttail-arm.patch \
            file://t6-not-declared.patch \
            file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
+           file://0001-Remove-ARM-specific-declarations-in-FELighting.h-unn.patch \
+           file://0002-More-dynamicDowncast-adoption-in-platform-code.patch \
            "
 SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561"
 
Signature · 1 line
2.34.1