[OE-core] [dunfell][PATCH v2] qemu: fix CVE-2020-24165
From: Lee Chee Yang
Signed-off-by: Lee Chee Yang
---
v2: update qemu.inc, rebase on latest HEAD
(926eb08fe325e2ea13098f99d920840b9354ceb9)
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2020-24165.patch| 94 +++
2 files changed, 95 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-24165.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 2669ba4ec8..e6b26aba88 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -141,6 +141,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2023-0330_2.patch \
file://CVE-2023-3354.patch \
file://CVE-2023-3180.patch \
+ file://CVE-2020-24165.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-24165.patch
b/meta/recipes-devtools/qemu/qemu/CVE-2020-24165.patch
new file mode 100644
index 00..e0a27331a8
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-24165.patch
@@ -0,0 +1,94 @@
+CVE: CVE-2020-24165
+Upstream-Status: Backport
[https://github.com/qemu/qemu/commit/886cc68943ebe8cf7e5f970be33459f95068a441 ]
+Signed-off-by: Lee Chee Yang
+
+From 886cc68943ebe8cf7e5f970be33459f95068a441 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Benn=C3=A9e?=
+Date: Fri, 14 Feb 2020 14:49:52 +
+Subject: [PATCH] accel/tcg: fix race in cpu_exec_step_atomic (bug 1863025)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The bug describes a race whereby cpu_exec_step_atomic can acquire a TB
+which is invalidated by a tb_flush before we execute it. This doesn't
+affect the other cpu_exec modes as a tb_flush by it's nature can only
+occur on a quiescent system. The race was described as:
+
+ B2. tcg_cpu_exec => cpu_exec => tb_find => tb_gen_code
+ B3. tcg_tb_alloc obtains a new TB
+
+ C3. TB obtained with tb_lookup__cpu_state or tb_gen_code
+ (same TB as B2)
+
+ A3. start_exclusive critical section entered
+ A4. do_tb_flush is called, TB memory freed/re-allocated
+ A5. end_exclusive exits critical section
+
+ B2. tcg_cpu_exec => cpu_exec => tb_find => tb_gen_code
+ B3. tcg_tb_alloc reallocates TB from B2
+
+ C4. start_exclusive critical section entered
+ C5. cpu_tb_exec executes the TB code that was free in A4
+
+The simplest fix is to widen the exclusive period to include the TB
+lookup. As a result we can drop the complication of checking we are in
+the exclusive region before we end it.
+
+Cc: Yifan
+Buglink: https://bugs.launchpad.net/qemu/+bug/1863025
+Reviewed-by: Paolo Bonzini
+Reviewed-by: Richard Henderson
+Signed-off-by: Alex Bennée
+Message-Id: <20200214144952.15502-1-alex.ben...@linaro.org>
+Signed-off-by: Richard Henderson
+---
+ accel/tcg/cpu-exec.c | 21 +++--
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
+index 2560c90eec79..d95c4848a47b 100644
+--- a/accel/tcg/cpu-exec.c
b/accel/tcg/cpu-exec.c
+@@ -240,6 +240,8 @@ void cpu_exec_step_atomic(CPUState *cpu)
+ uint32_t cf_mask = cflags & CF_HASH_MASK;
+
+ if (sigsetjmp(cpu->jmp_env, 0) == 0) {
++start_exclusive();
++
+ tb = tb_lookup__cpu_state(cpu, , _base, , cf_mask);
+ if (tb == NULL) {
+ mmap_lock();
+@@ -247,8 +249,6 @@ void cpu_exec_step_atomic(CPUState *cpu)
+ mmap_unlock();
+ }
+
+-start_exclusive();
+-
+ /* Since we got here, we know that parallel_cpus must be true. */
+ parallel_cpus = false;
+ cc->cpu_exec_enter(cpu);
+@@ -271,14 +271,15 @@ void cpu_exec_step_atomic(CPUState *cpu)
+ qemu_plugin_disable_mem_helpers(cpu);
+ }
+
+-if (cpu_in_exclusive_context(cpu)) {
+-/* We might longjump out of either the codegen or the
+- * execution, so must make sure we only end the exclusive
+- * region if we started it.
+- */
+-parallel_cpus = true;
+-end_exclusive();
+-}
++
++/*
++ * As we start the exclusive region before codegen we must still
++ * be in the region if we longjump out of either the codegen or
++ * the execution.
++ */
++g_assert(cpu_in_exclusive_context(cpu));
++parallel_cpus = true;
++end_exclusive();
+ }
+
+ struct tb_desc {
--
2.37.3
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188390):
https://lists.openembedded.org/g/openembedded-core/message/188390
Mute This Topic: https://lists.openembedded.org/mt/101651413/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] python3-cryptography{-vectors}: upgrade to 41.0.4
https://cryptography.io/en/latest/changelog/#v41-0-4
41.0.4 - 2023-09-19
Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.1.3.
Signed-off-by: Tim Orling
---
All ptests pass on qemux86-64 core-image-ptest-python3-cryptography image
(with the caveat that on Ubuntu 22.04 I had to uninstall llvm-14-dev to get
mesa-native to get past do_compile)
...vectors_41.0.3.bb => python3-cryptography-vectors_41.0.4.bb} | 2 +-
...n3-cryptography_41.0.3.bb => python3-cryptography_41.0.4.bb} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-cryptography-vectors_41.0.3.bb =>
python3-cryptography-vectors_41.0.4.bb} (91%)
rename meta/recipes-devtools/python/{python3-cryptography_41.0.3.bb =>
python3-cryptography_41.0.4.bb} (95%)
diff --git
a/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.3.bb
b/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.4.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-cryptography-vectors_41.0.3.bb
rename to meta/recipes-devtools/python/python3-cryptography-vectors_41.0.4.bb
index 1b499e02999..6b5d8adee97 100644
--- a/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.3.bb
+++ b/meta/recipes-devtools/python/python3-cryptography-vectors_41.0.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \
# NOTE: Make sure to keep this recipe at the same version as
python3-cryptography
# Upgrade both recipes at the same time
-SRC_URI[sha256sum] =
"80de0452c4b34f56f5518e81ebd75b6b905f5728aaed521d42e41f4ebc8a43fb"
+SRC_URI[sha256sum] =
"440af2813ea7aeb52181ec651a36d9ae8f0976e8b3a62b411a800fe6fa57a19e"
PYPI_PACKAGE = "cryptography_vectors"
diff --git a/meta/recipes-devtools/python/python3-cryptography_41.0.3.bb
b/meta/recipes-devtools/python/python3-cryptography_41.0.4.bb
similarity index 95%
rename from meta/recipes-devtools/python/python3-cryptography_41.0.3.bb
rename to meta/recipes-devtools/python/python3-cryptography_41.0.4.bb
index b6ea6608eb8..94977789c84 100644
--- a/meta/recipes-devtools/python/python3-cryptography_41.0.3.bb
+++ b/meta/recipes-devtools/python/python3-cryptography_41.0.4.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4 \
"
LDSHARED += "-pthread"
-SRC_URI[sha256sum] =
"6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34"
+SRC_URI[sha256sum] =
"7febc3094125fc126a7f6fb1f420d0da639f3f32cb15c8ff0dc3997c4549f51a"
SRC_URI += "file://0001-pyproject.toml-remove-benchmark-disable-option.patch \
file://0001-Fix-include-directory-when-cross-compiling-9129.patch \
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188389):
https://lists.openembedded.org/g/openembedded-core/message/188389
Mute This Topic: https://lists.openembedded.org/mt/101649264/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
On Thu, Sep 28, 2023 at 4:00 PM Tim Orling wrote: > > > > On Thu, Sep 28, 2023 at 3:55 PM Khem Raj wrote: >> >> On Thu, Sep 28, 2023 at 2:46 PM Tim Orling wrote: >> > >> > >> > >> > On Thu, Sep 28, 2023 at 1:34 PM Khem Raj wrote: >> >> >> >> Can you check if the machines where it fails has llvm-14-dev package >> >> installed on host ? >> >> >> > >> > In my case, yes. llvm-14-dev 1:14.0.0-1ubuntu1.1 >> >> yeah, this will expose the problem I guess that mesa/meson build files >> have logic for detecting llvm dependency uses cmake and how meson >> does this is by generating intermediate native file and ignoring >> llvm-config setting that OE has passed via meson.native file and finds >> one in >> /usr/bin and thats where the slippery slope starts. >> >> I am sure if you uninstall llvm-14-dev from your build host then it >> will start to work. I am looking into a patch to contain it meanwhile. >> > > Confirmed "fix". I don't remember why I have llvm-14-dev installed to begin > with so buh-bye Well, it atleast exposed a bug in mesa build. I have sent a patch to fix that. before you punt it give it a shot with llvm-14-dev installed on your system and see if this also fixes the issue. Keep llvm around, its nice :) > >> >> > >> >> >> >> On Thu, Sep 28, 2023 at 9:55 AM Khem Raj wrote: >> >> > >> >> > its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not >> >> > correct. Somehow its finding llvm library on your build host. >> >> > >> >> > On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie >> >> > wrote: >> >> > > >> >> > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: >> >> > > > Signed-off-by: Khem Raj >> >> > > > --- >> >> > > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 >> >> > > > --- >> >> > > > 1 file changed, 18 insertions(+), 9 deletions(-) >> >> > > > >> >> > > > diff --git >> >> > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> >> > > > >> >> > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> >> > > > index 3631a918b0c..0ca7a22b45b 100644 >> >> > > > --- >> >> > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> >> > > > +++ >> >> > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> >> > > > @@ -1,4 +1,4 @@ >> >> > > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 >> >> > > > 2001 >> >> > > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 >> >> > > > 2001 >> >> > > > From: Khem Raj >> >> > > > Date: Fri, 23 Jun 2023 01:20:38 -0700 >> >> > > > Subject: [PATCH] gallium: Fix build with llvm 17 >> >> > > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 >> >> > > > Upstream-Status: Submitted >> >> > > > [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] >> >> > > > Signed-off-by: Khem Raj >> >> > > > --- >> >> > > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- >> >> > > > - 1 file changed, 3 insertions(+), 1 deletion(-) >> >> > > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- >> >> > > > + 1 file changed, 4 insertions(+), 2 deletions(-) >> >> > > > >> >> > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c >> >> > > > b/src/gallium/auxiliary/gallivm/lp_bld_init.c >> >> > > > -index 24d0823..3d4573e 100644 >> >> > > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c >> >> > > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c >> >> > > > -@@ -42,8 +42,10 @@ >> >> > > > +@@ -42,19 +42,23 @@ >> >> > > > >> >> > > > #include >> >> > > > #include >> >> > > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 >> >> > > > #include >> >> > > > #endif >> >> > > > #include >> >> > > > --- >> >> > > > -2.41.0 >> >> > > > - >> >> > > > + #if GALLIVM_USE_NEW_PASS == 1 >> >> > > > + #include >> >> > > > +-#elif GALLIVM_HAVE_CORO == 1 >> >> > > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 >> >> > > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || >> >> > > > DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) >> >> > > > + #include >> >> > > > + #endif >> >> > > > ++#if LLVM_VERSION_MAJOR < 17 >> >> > > > + #include >> >> > > > + #endif >> >> > > > ++#endif >> >> > > > + >> >> > > > + unsigned gallivm_perf = 0; >> >> > > > + >> >> > > >> >> > > I think this patch may have broken against with the recent llvm point >> >> > > release? >> >> > > >> >> > > DEBUG: Executing shell function do_compile >> >> > > >> >> > > [1/33] >> >> > > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 >> >> > > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h >> >> > > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so >> >> > > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o >> >> > >
[OE-core] [PATCH 2/2] mesa: Simplify llvm-17 patch
llvm-17 support patch had redundant checks for llvm-17, Simplify them as submitted in v3 upstream Signed-off-by: Khem Raj --- .../mesa/files/0001-gallium-Fix-build-with-llvm-17.patch | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch index 0ca7a22b45b..165708145a7 100644 --- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +++ b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -42,19 +42,23 @@ +@@ -42,8 +42,10 @@ #include #include @@ -27,10 +27,7 @@ Signed-off-by: Khem Raj #include #endif #include - #if GALLIVM_USE_NEW_PASS == 1 - #include --#elif GALLIVM_HAVE_CORO == 1 -+#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 +@@ -53,8 +55,10 @@ #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) #include #endif -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188387): https://lists.openembedded.org/g/openembedded-core/message/188387 Mute This Topic: https://lists.openembedded.org/mt/101648330/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 1/2] mesa: Fix native build on hosts with llvm-dev installed
This issue is always there, it just shows up with newer LLVM since
symbol mismatches are being found otherwise it was happily linking with
host libLLVM.so silently.
Signed-off-by: Khem Raj
---
...e-cmake-dependency-detector-for-llvm.patch | 47 +++
meta/recipes-graphics/mesa/mesa.inc | 1 +
2 files changed, 48 insertions(+)
create mode 100644
meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
diff --git
a/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
new file mode 100644
index 000..3a836ab4821
--- /dev/null
+++
b/meta/recipes-graphics/mesa/files/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
@@ -0,0 +1,47 @@
+From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001
+From: Khem Raj
+Date: Thu, 28 Sep 2023 15:34:22 -0700
+Subject: [PATCH] meson: Disable cmake dependency detector for llvm
+
+meson dependency auto dependency detection uses cmake and then
+config-tool to process dependencies, in mesa the logic to detect llvm is
+using auto detection which means if it finds cmake then it will try to
+use cmake method. Cmake method works ok except a case when llvm-dev
+package is installed on the build host then it generates its own
+native.meson file and ignores OE supplied meson.native file which has
+correct llvm-config tool specified which is pointing to llvm-config from
+native sysroot. The generated meson.native file points to one found in
+/usr/bin and there onwards detector finds native install of llvm and
+configures that into building native mesa package.
+
+Since cmake detector does not always work, disable it by default and use
+config-tool which works in all cases. This is suggested in below issues
+too
+
+A similar issue is open in meson upstream [1] and mesa [2]
+
+[1] https://github.com/mesonbuild/meson/issues/10483
+[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738
+
+Upstream-Status: Inappropriate [Cross-compile specific]
+
+Signed-off-by: Khem Raj
+---
+ meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/meson.build b/meson.build
+index 00a6953..05815ec 100644
+--- a/meson.build
b/meson.build
+@@ -1659,6 +1659,7 @@ with_llvm = false
+ if _llvm.allowed()
+ dep_llvm = dependency(
+ 'llvm',
++method : 'config-tool',
+ version : _llvm_version,
+ modules : llvm_modules,
+ optional_modules : llvm_optional_modules,
+--
+2.42.0
+
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index 559d445ae5e..4e824500dd0 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -19,6 +19,7 @@ SRC_URI =
"https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-gallium-Fix-build-with-llvm-17.patch \
file://0001-intel-Allow-using-intel_clc-from-the-system.patch \
+ file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \
"
SRC_URI[sha256sum] =
"45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad"
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188386):
https://lists.openembedded.org/g/openembedded-core/message/188386
Mute This Topic: https://lists.openembedded.org/mt/101648329/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
On Thu, Sep 28, 2023 at 3:55 PM Khem Raj wrote: > On Thu, Sep 28, 2023 at 2:46 PM Tim Orling wrote: > > > > > > > > On Thu, Sep 28, 2023 at 1:34 PM Khem Raj wrote: > >> > >> Can you check if the machines where it fails has llvm-14-dev package > >> installed on host ? > >> > > > > In my case, yes. llvm-14-dev 1:14.0.0-1ubuntu1.1 > > yeah, this will expose the problem I guess that mesa/meson build files > have logic for detecting llvm dependency uses cmake and how meson > does this is by generating intermediate native file and ignoring > llvm-config setting that OE has passed via meson.native file and finds > one in > /usr/bin and thats where the slippery slope starts. > > I am sure if you uninstall llvm-14-dev from your build host then it > will start to work. I am looking into a patch to contain it meanwhile. > > Confirmed "fix". I don't remember why I have llvm-14-dev installed to begin with so buh-bye > > > >> > >> On Thu, Sep 28, 2023 at 9:55 AM Khem Raj wrote: > >> > > >> > its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not > >> > correct. Somehow its finding llvm library on your build host. > >> > > >> > On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie > >> > wrote: > >> > > > >> > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: > >> > > > Signed-off-by: Khem Raj > >> > > > --- > >> > > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 > --- > >> > > > 1 file changed, 18 insertions(+), 9 deletions(-) > >> > > > > >> > > > diff --git > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > >> > > > index 3631a918b0c..0ca7a22b45b 100644 > >> > > > --- > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > >> > > > +++ > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > >> > > > @@ -1,4 +1,4 @@ > >> > > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 > 00:00:00 2001 > >> > > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 > 00:00:00 2001 > >> > > > From: Khem Raj > >> > > > Date: Fri, 23 Jun 2023 01:20:38 -0700 > >> > > > Subject: [PATCH] gallium: Fix build with llvm 17 > >> > > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= > 17 > >> > > > Upstream-Status: Submitted [ > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] > >> > > > Signed-off-by: Khem Raj > >> > > > --- > >> > > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- > >> > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > >> > > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- > >> > > > + 1 file changed, 4 insertions(+), 2 deletions(-) > >> > > > > >> > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > >> > > > -index 24d0823..3d4573e 100644 > >> > > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > >> > > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > >> > > > -@@ -42,8 +42,10 @@ > >> > > > +@@ -42,19 +42,23 @@ > >> > > > > >> > > > #include > >> > > > #include > >> > > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 > >> > > > #include > >> > > > #endif > >> > > > #include > >> > > > --- > >> > > > -2.41.0 > >> > > > - > >> > > > + #if GALLIVM_USE_NEW_PASS == 1 > >> > > > + #include > >> > > > +-#elif GALLIVM_HAVE_CORO == 1 > >> > > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 > >> > > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || > DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > >> > > > + #include > >> > > > + #endif > >> > > > ++#if LLVM_VERSION_MAJOR < 17 > >> > > > + #include > >> > > > + #endif > >> > > > ++#endif > >> > > > + > >> > > > + unsigned gallivm_perf = 0; > >> > > > + > >> > > > >> > > I think this patch may have broken against with the recent llvm > point > >> > > release? > >> > > > >> > > DEBUG: Executing shell function do_compile > >> > > > >> > > [1/33] > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h > >> > > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group > -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib >
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
On Thu, Sep 28, 2023 at 2:46 PM Tim Orling wrote: > > > > On Thu, Sep 28, 2023 at 1:34 PM Khem Raj wrote: >> >> Can you check if the machines where it fails has llvm-14-dev package >> installed on host ? >> > > In my case, yes. llvm-14-dev 1:14.0.0-1ubuntu1.1 yeah, this will expose the problem I guess that mesa/meson build files have logic for detecting llvm dependency uses cmake and how meson does this is by generating intermediate native file and ignoring llvm-config setting that OE has passed via meson.native file and finds one in /usr/bin and thats where the slippery slope starts. I am sure if you uninstall llvm-14-dev from your build host then it will start to work. I am looking into a patch to contain it meanwhile. > >> >> On Thu, Sep 28, 2023 at 9:55 AM Khem Raj wrote: >> > >> > its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not >> > correct. Somehow its finding llvm library on your build host. >> > >> > On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie >> > wrote: >> > > >> > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: >> > > > Signed-off-by: Khem Raj >> > > > --- >> > > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 --- >> > > > 1 file changed, 18 insertions(+), 9 deletions(-) >> > > > >> > > > diff --git >> > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> > > > >> > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> > > > index 3631a918b0c..0ca7a22b45b 100644 >> > > > --- >> > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> > > > +++ >> > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch >> > > > @@ -1,4 +1,4 @@ >> > > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 2001 >> > > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 2001 >> > > > From: Khem Raj >> > > > Date: Fri, 23 Jun 2023 01:20:38 -0700 >> > > > Subject: [PATCH] gallium: Fix build with llvm 17 >> > > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 >> > > > Upstream-Status: Submitted >> > > > [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] >> > > > Signed-off-by: Khem Raj >> > > > --- >> > > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- >> > > > - 1 file changed, 3 insertions(+), 1 deletion(-) >> > > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- >> > > > + 1 file changed, 4 insertions(+), 2 deletions(-) >> > > > >> > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c >> > > > b/src/gallium/auxiliary/gallivm/lp_bld_init.c >> > > > -index 24d0823..3d4573e 100644 >> > > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c >> > > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c >> > > > -@@ -42,8 +42,10 @@ >> > > > +@@ -42,19 +42,23 @@ >> > > > >> > > > #include >> > > > #include >> > > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 >> > > > #include >> > > > #endif >> > > > #include >> > > > --- >> > > > -2.41.0 >> > > > - >> > > > + #if GALLIVM_USE_NEW_PASS == 1 >> > > > + #include >> > > > +-#elif GALLIVM_HAVE_CORO == 1 >> > > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 >> > > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || >> > > > DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) >> > > > + #include >> > > > + #endif >> > > > ++#if LLVM_VERSION_MAJOR < 17 >> > > > + #include >> > > > + #endif >> > > > ++#endif >> > > > + >> > > > + unsigned gallivm_perf = 0; >> > > > + >> > > >> > > I think this patch may have broken against with the recent llvm point >> > > release? >> > > >> > > DEBUG: Executing shell function do_compile >> > > >> > > [1/33] >> > > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 >> > > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h >> > > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so >> > > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o >> > > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib >> > > >> > > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib >> > > -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group >> > > -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags >> > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib >> > > >> > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib >> > > >> > > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib >> > > >> > >
[OE-core] [PATCH 1/2] insane: Add QA check for RRECOMMENDS on non-existent packages
Add a package QA check for when a package RRECOMMENDS another that won't
be built because it is empty and ALLOW_EMPTY is not set. This happens
usually when ${PN}-dev RRECOMMENDS ${PN} but ${PN} is empty. This is not
an error but might be something to look into.
Example of a generated warning:
WARNING: python3-3.11.2-r0 do_package_qa:
QA Issue: python3-dev -> python3 but won't be build [rrecommends-non-existent]
Note: This QA check is voluntarily not enabled by default.
This will make bugs [YOCTO #8222] and [YOCTO #6839] appear in the QA logs.
Co-authored-by: Fawzi Khaber
Signed-off-by: Yoann Congal
---
meta/classes-global/insane.bbclass | 11 +++
1 file changed, 11 insertions(+)
diff --git a/meta/classes-global/insane.bbclass
b/meta/classes-global/insane.bbclass
index 5743d91240..14334f02a9 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -1088,6 +1088,17 @@ def package_qa_check_empty_dirs(pkg, d, messages):
msg = "%s installs files in %s, %s" % (pkg, dir, recommendation)
oe.qa.add_message(messages, "empty-dirs", msg)
+QAPKGTEST[rrecommends-non-existent] =
"package_qa_check_rrecommends_non_existent"
+def package_qa_check_rrecommends_non_existent(pkg, d, messages):
+pkg_data = oe.packagedata.read_subpkgdata_dict(pkg, d)
+rrecommends = bb.utils.explode_dep_versions2(pkg_data.get("RRECOMMENDS",
""))
+for rrecommend in rrecommends:
+rrec_data = oe.packagedata.read_subpkgdata_dict(rrecommend, d)
+if (rrecommend in (d.getVar("PACKAGES") or "").split()
+and rrec_data["FILES_INFO"] == "{}"
+and not bb.utils.to_boolean(rrec_data.get("ALLOW_EMPTY", "0"),
False)):
+oe.qa.add_message(messages, "rrecommends-non-existent", "{0}
rrecommends {1} but {1} won't be built".format(pkg, rrecommend))
+
def package_qa_check_encoding(keys, encode, d):
def check_encoding(key, enc):
sane = True
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188382):
https://lists.openembedded.org/g/openembedded-core/message/188382
Mute This Topic: https://lists.openembedded.org/mt/101647339/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 0/2] Empty packages and bogus dependencies (Part 1)
This is the first step toward better handling of empty packages and bogus
dependencies (e.g. ${PN}-dev -> ${PN}, ${PN}, being empty).
See: https://lists.openembedded.org/g/openembedded-architecture/message/1701
> a) Add warnings for dependencies (RDEPENDS or RRECOMMENDS) on packages
> which don't get created for some reason (either not in PACKAGES or not
> ALLOW_EMPTY). We should be able to properly check this using
> packagedata which never used to exist as it does now when these bugs
> were first created! We can leave the warnings disabled at first until
> we clean things up for core and our key layers
Regards,
Yoann
Fawzi KHABER (1):
meta/recipes: Remove empty ${PN}/DEV_PKG_DEPENDENCY workarounds
Yoann Congal (1):
insane: Add QA check for RRECOMMENDS on non-existent packages
meta/classes-global/insane.bbclass| 11 +++
meta/recipes-connectivity/bind/bind_9.18.19.bb| 1 -
meta/recipes-core/musl/bsd-headers.bb | 1 -
meta/recipes-core/musl/libssp-nonshared.bb| 1 -
meta/recipes-core/newlib/newlib_git.bb| 3 ---
meta/recipes-devtools/gcc/libgcc-common.inc | 4
meta/recipes-devtools/python/python3_3.11.5.bb| 1 -
meta/recipes-graphics/mesa/libglu_9.0.3.bb| 3 ---
meta/recipes-graphics/mesa/mesa.inc | 3 ---
.../recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb | 1 -
meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb| 1 -
meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb | 1 -
meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb | 3 +--
meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb | 3 +--
.../linux-libc-headers/linux-libc-headers.inc | 1 -
.../make-mod-scripts/make-mod-scripts_1.0.bb | 1 -
.../argp-standalone/argp-standalone_1.4.1.bb | 1 -
17 files changed, 13 insertions(+), 27 deletions(-)
--
2.30.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188381):
https://lists.openembedded.org/g/openembedded-core/message/188381
Mute This Topic: https://lists.openembedded.org/mt/101647338/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] meta/recipes: Remove empty ${PN}/DEV_PKG_DEPENDENCY workarounds
From: Fawzi KHABER
Remove superfluous DEV_PKG_DEPENDENCY = "" previously used to bypass
${PN}-dev package RDEPENDS on empty ${PN}. DEV_PKG_DEPENDENCY
applies RRECOMMENDS now, all workarounds are not needed anymore.
Related to [YOCTO #6839] and [YOCTO #8222]
Signed-off-by: Yoann CONGAL
Signed-off-by: Fawzi KHABER
---
meta/recipes-connectivity/bind/bind_9.18.19.bb| 1 -
meta/recipes-core/musl/bsd-headers.bb | 1 -
meta/recipes-core/musl/libssp-nonshared.bb| 1 -
meta/recipes-core/newlib/newlib_git.bb| 3 ---
meta/recipes-devtools/gcc/libgcc-common.inc | 4
meta/recipes-devtools/python/python3_3.11.5.bb| 1 -
meta/recipes-graphics/mesa/libglu_9.0.3.bb| 3 ---
meta/recipes-graphics/mesa/mesa.inc | 3 ---
meta/recipes-graphics/xorg-lib/libpthread-stubs_0.5.bb| 1 -
meta/recipes-graphics/xorg-lib/xtrans_1.5.0.bb| 1 -
meta/recipes-graphics/xorg-proto/xcb-proto_1.16.0.bb | 1 -
meta/recipes-graphics/xorg-proto/xorgproto_2023.2.bb | 3 +--
meta/recipes-graphics/xorg-util/util-macros_1.20.0.bb | 3 +--
meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 1 -
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 1 -
meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb | 1 -
16 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/meta/recipes-connectivity/bind/bind_9.18.19.bb
b/meta/recipes-connectivity/bind/bind_9.18.19.bb
index 8124c5c591..01f5c9e852 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.19.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.19.bb
@@ -110,4 +110,3 @@ PACKAGE_BEFORE_PN += "${PN}-libs"
FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so"
FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so"
-DEV_PKG_DEPENDENCY = ""
diff --git a/meta/recipes-core/musl/bsd-headers.bb
b/meta/recipes-core/musl/bsd-headers.bb
index 887a816031..8a2f4177a7 100644
--- a/meta/recipes-core/musl/bsd-headers.bb
+++ b/meta/recipes-core/musl/bsd-headers.bb
@@ -27,5 +27,4 @@ do_install() {
#
COMPATIBLE_HOST = ".*-musl.*"
-DEV_PKG_DEPENDENCY = ""
RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-core/musl/libssp-nonshared.bb
b/meta/recipes-core/musl/libssp-nonshared.bb
index 3faf8f00c3..982bcc47a5 100644
--- a/meta/recipes-core/musl/libssp-nonshared.bb
+++ b/meta/recipes-core/musl/libssp-nonshared.bb
@@ -31,5 +31,4 @@ do_install() {
#
COMPATIBLE_HOST = ".*-musl.*"
RDEPENDS:${PN}-staticdev = ""
-DEV_PKG_DEPENDENCY = ""
RRECOMMENDS:${PN}-dbg = "${PN}-staticdev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-core/newlib/newlib_git.bb
b/meta/recipes-core/newlib/newlib_git.bb
index fb922d65d1..a3687f5e67 100644
--- a/meta/recipes-core/newlib/newlib_git.bb
+++ b/meta/recipes-core/newlib/newlib_git.bb
@@ -15,6 +15,3 @@ do_install:append() {
# Remove original directory
rmdir ${D}${prefix}/${TARGET_SYS}
}
-
-# No rpm package is actually created but -dev depends on it, avoid dnf error
-DEV_PKG_DEPENDENCY:libc-newlib = ""
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc
b/meta/recipes-devtools/gcc/libgcc-common.inc
index d9084af51a..7e357af3b9 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -54,10 +54,6 @@ do_install:append:libc-newlib () {
fi
}
-# No rpm package is actually created but -dev depends on it, avoid dnf error
-DEV_PKG_DEPENDENCY:libc-baremetal = ""
-DEV_PKG_DEPENDENCY:libc-newlib = ""
-
BBCLASSEXTEND = "nativesdk"
addtask multilib_install after do_install before do_package do_populate_sysroot
diff --git a/meta/recipes-devtools/python/python3_3.11.5.bb
b/meta/recipes-devtools/python/python3_3.11.5.bb
index 8e023c7dfb..f391a1ca14 100644
--- a/meta/recipes-devtools/python/python3_3.11.5.bb
+++ b/meta/recipes-devtools/python/python3_3.11.5.bb
@@ -441,7 +441,6 @@ RDEPENDS:${PN}-ptest = "${PN}-modules ${PN}-tests ${PN}-dev
${PN}-cgitb ${PN}-zi
RDEPENDS:${PN}-ptest:append:libc-glibc = " locale-base-tr-tr"
RDEPENDS:${PN}-tkinter += "${@bb.utils.contains('PACKAGECONFIG', 'tk',
'${MLPREFIX}tk ${MLPREFIX}tk-lib', '', d)}"
RDEPENDS:${PN}-idle += "${@bb.utils.contains('PACKAGECONFIG', 'tk',
'${PN}-tkinter ${MLPREFIX}tcl', '', d)}"
-DEV_PKG_DEPENDENCY = ""
RDEPENDS:${PN}-pydoc += "${PN}-io"
RDEPENDS:${PN}-tests:append:class-target = " ${MLPREFIX}bash"
diff --git a/meta/recipes-graphics/mesa/libglu_9.0.3.bb
b/meta/recipes-graphics/mesa/libglu_9.0.3.bb
index 8151727c52..880a02d916 100644
--- a/meta/recipes-graphics/mesa/libglu_9.0.3.bb
+++ b/meta/recipes-graphics/mesa/libglu_9.0.3.bb
@@ -26,6 +26,3 @@ EXTRA_OEMESON = "-Dgl_provider=gl"
# Requires libGL.so which is provided by mesa when x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11 opengl"
-
-# Remove the mesa-glu dependency in
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
On Thu, Sep 28, 2023 at 1:34 PM Khem Raj wrote: > Can you check if the machines where it fails has llvm-14-dev package > installed on host ? > > In my case, yes. llvm-14-dev 1:14.0.0-1ubuntu1.1 > On Thu, Sep 28, 2023 at 9:55 AM Khem Raj wrote: > > > > its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not > > correct. Somehow its finding llvm library on your build host. > > > > On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie > > wrote: > > > > > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: > > > > Signed-off-by: Khem Raj > > > > --- > > > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 > --- > > > > 1 file changed, 18 insertions(+), 9 deletions(-) > > > > > > > > diff --git > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > > index 3631a918b0c..0ca7a22b45b 100644 > > > > --- > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > > +++ > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > > @@ -1,4 +1,4 @@ > > > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 > 2001 > > > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 > 2001 > > > > From: Khem Raj > > > > Date: Fri, 23 Jun 2023 01:20:38 -0700 > > > > Subject: [PATCH] gallium: Fix build with llvm 17 > > > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 > > > > Upstream-Status: Submitted [ > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] > > > > Signed-off-by: Khem Raj > > > > --- > > > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- > > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- > > > > + 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > > -index 24d0823..3d4573e 100644 > > > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > > -@@ -42,8 +42,10 @@ > > > > +@@ -42,19 +42,23 @@ > > > > > > > > #include > > > > #include > > > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 > > > > #include > > > > #endif > > > > #include > > > > --- > > > > -2.41.0 > > > > - > > > > + #if GALLIVM_USE_NEW_PASS == 1 > > > > + #include > > > > +-#elif GALLIVM_HAVE_CORO == 1 > > > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 > > > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || > DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > > > > + #include > > > > + #endif > > > > ++#if LLVM_VERSION_MAJOR < 17 > > > > + #include > > > > + #endif > > > > ++#endif > > > > + > > > > + unsigned gallivm_perf = 0; > > > > + > > > > > > I think this patch may have broken against with the recent llvm point > > > release? > > > > > > DEBUG: Executing shell function do_compile > > > > > > [1/33] > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h > > > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group > -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,-O1 -Wl,--allow-shlib-undefined > -Wl,--dynamic-linker=/srv/build/ttorling/workspace-upgrades/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > '-Wl,-rpath,$ORIGIN/../../../mapi/shared-glapi:/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib' > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/build/src/mapi/shared-glapi > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib > src/gallium/frontends/dri/libdri.a
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
Can you check if the machines where it fails has llvm-14-dev package installed on host ? On Thu, Sep 28, 2023 at 9:55 AM Khem Raj wrote: > > its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not > correct. Somehow its finding llvm library on your build host. > > On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie > wrote: > > > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: > > > Signed-off-by: Khem Raj > > > --- > > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 --- > > > 1 file changed, 18 insertions(+), 9 deletions(-) > > > > > > diff --git > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > index 3631a918b0c..0ca7a22b45b 100644 > > > --- > > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > +++ > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > @@ -1,4 +1,4 @@ > > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 2001 > > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 2001 > > > From: Khem Raj > > > Date: Fri, 23 Jun 2023 01:20:38 -0700 > > > Subject: [PATCH] gallium: Fix build with llvm 17 > > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 > > > Upstream-Status: Submitted > > > [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] > > > Signed-off-by: Khem Raj > > > --- > > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- > > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- > > > + 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > -index 24d0823..3d4573e 100644 > > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > > -@@ -42,8 +42,10 @@ > > > +@@ -42,19 +42,23 @@ > > > > > > #include > > > #include > > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 > > > #include > > > #endif > > > #include > > > --- > > > -2.41.0 > > > - > > > + #if GALLIVM_USE_NEW_PASS == 1 > > > + #include > > > +-#elif GALLIVM_HAVE_CORO == 1 > > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 > > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM > > > || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > > > + #include > > > + #endif > > > ++#if LLVM_VERSION_MAJOR < 17 > > > + #include > > > + #endif > > > ++#endif > > > + > > > + unsigned gallivm_perf = 0; > > > + > > > > I think this patch may have broken against with the recent llvm point > > release? > > > > DEBUG: Executing shell function do_compile > > > > [1/33] > > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 > > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h > > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so > > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o > > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > > > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > > -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group > > -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > > > > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > > > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > > -Wl,-O1 -Wl,--allow-shlib-undefined > > -Wl,--dynamic-linker=/srv/build/ttorling/workspace-upgrades/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > > > > '-Wl,-rpath,$ORIGIN/../../../mapi/shared-glapi:/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib' > > > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/build/src/mapi/shared-glapi > > > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib > > src/gallium/frontends/dri/libdri.a src/util/libmesa_util.a > > src/util/format/libmesa_format.a src/util/libmesa_util_sse41.a > > src/c11/impl/libmesa_util_c11.a
[OE-core][PATCH] classes/create-spdx-2.2: Show error if document is not found
As in other places, print a more helpful error if a SPDX document is not
found when assembling documents for the final SPDX archive.
Signed-off-by: Joshua Watt
---
meta/classes/create-spdx-2.2.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/create-spdx-2.2.bbclass
b/meta/classes/create-spdx-2.2.bbclass
index 3ee1b7ee0d8..b0aef80db16 100644
--- a/meta/classes/create-spdx-2.2.bbclass
+++ b/meta/classes/create-spdx-2.2.bbclass
@@ -1131,6 +1131,8 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir,
rootfs_spdxid, packages, spdx
for ref in doc.externalDocumentRefs:
ref_path = oe.sbom.doc_find_by_namespace(deploy_dir_spdx,
package_archs, ref.spdxDocument)
+if not ref_path:
+bb.fatal("Cannot find any SPDX file for document %s" %
ref.spdxDocument)
collect_spdx_document(ref_path)
collect_spdx_document(image_spdx_path)
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188378):
https://lists.openembedded.org/g/openembedded-core/message/188378
Mute This Topic: https://lists.openembedded.org/mt/101643801/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [Openembedded-architecture] Core workflow: sstate for all, bblock/bbunlock, tools for why is sstate not being reused?
On Thu, 28 Sept 2023 at 18:49, Richard Purdie wrote: > I've wondered if we should split bitbake -S printdiff into a separate > utility? It exists from a time before we had bitbake command APIs. It can also be a simple shell wrapper. I've separated -S lockedsigs into it's own option as well, so it can be explicitly requested (just need to fix up a couple of selftests that relied on -S none to get locked-sigs.inc): https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/sstate-for-all=41e8a8a79bac4e3b9eb74a99e32e0d26ac8af0c5 > I'm curious to see what you find with analysis of bitbake-whatchanged. > I'm also somewhat surprised the scenarios you're testing all work! It's not 100% perfect. One out of 2*3=6 scenarios isn't fully functional (gcc-source:do_preconfigure signature isn't found from sstate even though it exists there - but it is found if it's in tmp/stamps/). I left a FIXME in the test. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188377): https://lists.openembedded.org/g/openembedded-core/message/188377 Mute This Topic: https://lists.openembedded.org/mt/101501384/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
its linking with /usr/lib/llvm-14/lib/libLLVM-14.so.1 which is not correct. Somehow its finding llvm library on your build host. On Thu, Sep 28, 2023 at 8:25 AM Richard Purdie wrote: > > On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: > > Signed-off-by: Khem Raj > > --- > > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 --- > > 1 file changed, 18 insertions(+), 9 deletions(-) > > > > diff --git > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > index 3631a918b0c..0ca7a22b45b 100644 > > --- > > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > +++ > > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > > @@ -1,4 +1,4 @@ > > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 2001 > > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 2001 > > From: Khem Raj > > Date: Fri, 23 Jun 2023 01:20:38 -0700 > > Subject: [PATCH] gallium: Fix build with llvm 17 > > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 > > Upstream-Status: Submitted > > [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] > > Signed-off-by: Khem Raj > > --- > > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- > > - 1 file changed, 3 insertions(+), 1 deletion(-) > > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- > > + 1 file changed, 4 insertions(+), 2 deletions(-) > > > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > -index 24d0823..3d4573e 100644 > > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > > -@@ -42,8 +42,10 @@ > > +@@ -42,19 +42,23 @@ > > > > #include > > #include > > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 > > #include > > #endif > > #include > > --- > > -2.41.0 > > - > > + #if GALLIVM_USE_NEW_PASS == 1 > > + #include > > +-#elif GALLIVM_HAVE_CORO == 1 > > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 > > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || > > DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > > + #include > > + #endif > > ++#if LLVM_VERSION_MAJOR < 17 > > + #include > > + #endif > > ++#endif > > + > > + unsigned gallivm_perf = 0; > > + > > I think this patch may have broken against with the recent llvm point > release? > > DEBUG: Executing shell function do_compile > > [1/33] > /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 > ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h > [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so > src/gallium/targets/dri/libgallium_dri.so.p/target.c.o > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group > -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib > > -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib > -Wl,-O1 -Wl,--allow-shlib-undefined > -Wl,--dynamic-linker=/srv/build/ttorling/workspace-upgrades/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 > > '-Wl,-rpath,$ORIGIN/../../../mapi/shared-glapi:/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib' > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/build/src/mapi/shared-glapi > > -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib > src/gallium/frontends/dri/libdri.a src/util/libmesa_util.a > src/util/format/libmesa_format.a src/util/libmesa_util_sse41.a > src/c11/impl/libmesa_util_c11.a src/mesa/libmesa.a > src/compiler/glsl/libglsl.a src/compiler/glsl/glcpp/libglcpp.a > src/compiler/nir/libnir.a src/compiler/libcompiler.a src/mesa/libmesa_sse41.a > src/gallium/auxiliary/libgalliumvl.a src/gallium/auxiliary/libgallium.a > src/mapi/shared-glapi/libglapi.so.0.0.0 > src/gallium/auxiliary/pipe-loader/libpipe_loader_static.a >
Re: [OE-core] [Openembedded-architecture] Core workflow: sstate for all, bblock/bbunlock, tools for why is sstate not being reused?
On Thu, 2023-09-28 at 18:43 +0200, Alexander Kanavin wrote: > On Fri, 22 Sept 2023 at 12:42, Richard Purdie > wrote: > > > Things which used to be problematic: > > > > a) changes involving changes to gcc-source since it uses a shared > > sources stamps which confused the tools (at least used to). That may > > have been before gcc-source became a recipe? > > b) changes to a very common component (e.g. autoconf-native's > > do_configure) which make it hard to understand where the root cause of > > the changes came from > > c) changes which affect many recipes at once, e.g. the do_configure > > function in base.bbclass > > > > It might be helpful to write test cases for the scenario you showed as > > working above and some of the ones I mention above, then we can > > document they work and have an easier way to add tests for issues > > if/as/when we identify the problematic scenarios in future. > > I've now written down the tests for these three scenarios and got them > to pass (in oe-selftest too \0/): > https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/sstate-for-all > (check the commit message too) > > I am going to look closer at bitbake-whatchanged, what it aims to do > and why it doesn't work. I have a hunch it can produce useful high > level reports, and so shouldn't be simply thrown away. 'bitbake -S > printdiff' is too techy and verbose for some use cases. Maybe we can > fold that functionality into 'bitbake -S whatchanged'. I've wondered if we should split bitbake -S printdiff into a separate utility? It exists from a time before we had bitbake command APIs. I'm curious to see what you find with analysis of bitbake-whatchanged. I'm also somewhat surprised the scenarios you're testing all work! I'm guess one of the commits I pointed to must have fixed them (the removal of paths from the sig files)? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188375): https://lists.openembedded.org/g/openembedded-core/message/188375 Mute This Topic: https://lists.openembedded.org/mt/101501384/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [Openembedded-architecture] Core workflow: sstate for all, bblock/bbunlock, tools for why is sstate not being reused?
On Fri, 22 Sept 2023 at 12:42, Richard Purdie wrote: > Things which used to be problematic: > > a) changes involving changes to gcc-source since it uses a shared > sources stamps which confused the tools (at least used to). That may > have been before gcc-source became a recipe? > b) changes to a very common component (e.g. autoconf-native's > do_configure) which make it hard to understand where the root cause of > the changes came from > c) changes which affect many recipes at once, e.g. the do_configure > function in base.bbclass > > It might be helpful to write test cases for the scenario you showed as > working above and some of the ones I mention above, then we can > document they work and have an easier way to add tests for issues > if/as/when we identify the problematic scenarios in future. I've now written down the tests for these three scenarios and got them to pass (in oe-selftest too \0/): https://git.yoctoproject.org/poky-contrib/commit/?h=akanavin/sstate-for-all (check the commit message too) I am going to look closer at bitbake-whatchanged, what it aims to do and why it doesn't work. I have a hunch it can produce useful high level reports, and so shouldn't be simply thrown away. 'bitbake -S printdiff' is too techy and verbose for some use cases. Maybe we can fold that functionality into 'bitbake -S whatchanged'. I'm on holiday next week. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#188374): https://lists.openembedded.org/g/openembedded-core/message/188374 Mute This Topic: https://lists.openembedded.org/mt/101501384/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] mesa: Update clang-17 patch to upstream v2
On Fri, 2023-09-22 at 09:37 -0700, Khem Raj wrote: > Signed-off-by: Khem Raj > --- > .../0001-gallium-Fix-build-with-llvm-17.patch | 27 --- > 1 file changed, 18 insertions(+), 9 deletions(-) > > diff --git > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > index 3631a918b0c..0ca7a22b45b 100644 > --- > a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > +++ > b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch > @@ -1,4 +1,4 @@ > -From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 2001 > +From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Fri, 23 Jun 2023 01:20:38 -0700 > Subject: [PATCH] gallium: Fix build with llvm 17 > @@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17 > Upstream-Status: Submitted > [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] > Signed-off-by: Khem Raj > --- > - src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++- > - 1 file changed, 3 insertions(+), 1 deletion(-) > + src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 -- > + 1 file changed, 4 insertions(+), 2 deletions(-) > > -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > -index 24d0823..3d4573e 100644 > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > -@@ -42,8 +42,10 @@ > +@@ -42,19 +42,23 @@ > > #include > #include > @@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644 > #include > #endif > #include > --- > -2.41.0 > - > + #if GALLIVM_USE_NEW_PASS == 1 > + #include > +-#elif GALLIVM_HAVE_CORO == 1 > ++#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 > + #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || > DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) > + #include > + #endif > ++#if LLVM_VERSION_MAJOR < 17 > + #include > + #endif > ++#endif > + > + unsigned gallivm_perf = 0; > + I think this patch may have broken against with the recent llvm point release? DEBUG: Executing shell function do_compile [1/33] /srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/bin/python3-native/python3 ../mesa-23.1.8/bin/git_sha1_gen.py --output src/git_sha1.h [2/13] g++ -o src/gallium/targets/dri/libgallium_dri.so src/gallium/targets/dri/libgallium_dri.so.p/target.c.o -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib -L/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib -Wl,--as-needed -Wl,--no-undefined -shared -fPIC -Wl,--start-group -Wl,-soname,libgallium_dri.so -Wl,--enable-new-dtags -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib -Wl,-rpath,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/lib -Wl,-O1 -Wl,--allow-shlib-undefined -Wl,--dynamic-linker=/srv/build/ttorling/workspace-upgrades/build/tmp/sysroots-uninative/x86_64-linux/lib/ld-linux-x86-64.so.2 '-Wl,-rpath,$ORIGIN/../../../mapi/shared-glapi:/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib' -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/build/src/mapi/shared-glapi -Wl,-rpath-link,/srv/build/ttorling/workspace-upgrades/build/tmp/work/x86_64-linux/mesa-native/23.1.8/recipe-sysroot-native/usr/lib/pkgconfig/../../../usr/lib src/gallium/frontends/dri/libdri.a src/util/libmesa_util.a src/util/format/libmesa_format.a src/util/libmesa_util_sse41.a src/c11/impl/libmesa_util_c11.a src/mesa/libmesa.a src/compiler/glsl/libglsl.a src/compiler/glsl/glcpp/libglcpp.a src/compiler/nir/libnir.a src/compiler/libcompiler.a src/mesa/libmesa_sse41.a src/gallium/auxiliary/libgalliumvl.a src/gallium/auxiliary/libgallium.a src/mapi/shared-glapi/libglapi.so.0.0.0 src/gallium/auxiliary/pipe-loader/libpipe_loader_static.a src/loader/libloader.a src/util/libxmlconfig.a src/gallium/winsys/sw/null/libws_null.a src/gallium/winsys/sw/wrapper/libwsw.a src/gallium/winsys/sw/dri/libswdri.a src/gallium/winsys/sw/kms-dri/libswkmsdri.a src/gallium/drivers/llvmpipe/libllvmpipe.a src/gallium/drivers/softpipe/libsoftpipe.a src/gallium/drivers/r300/libr300.a src/gallium/winsys/radeon/drm/libradeonwinsys.a
Re: [OE-core][RFC 2/2] rust-cross-canadian: set CARGO_TARGET__RUNNER for nativesdk
This seems like a good change (being able to easily run items built
with c/c++ tolchains in yocto SDKs is a problem no one has
satisfactorily resolved, and it's nice that rust got this right), but
can you expand the test in meta/lib/oeqa/sdk/cases/rust.py to cover
possible target options such as this one?
Alex
On Thu, 28 Sept 2023 at 10:10, Sean Nyekjaer wrote:
>
> This will enable us to build and run rust programs on the sdk host.
>
> % cargo run --target x86_64-oesdk-linux-gnu -vv
>Fresh hello v0.1.0 (~/development/hello)
> Finished dev [unoptimized + debuginfo] target(s) in 0.02s
> Running
> `/usr/local/sdk/sysroots/x86_64-oesdk-linux/lib/ld-linux-x86-64.so.2
> target/x86_64-oesdk-linux-gnu/debug/hello`
> Hello, world
>
> Signed-off-by: Sean Nyekjaer
> ---
> meta/recipes-devtools/rust/rust-cross-canadian.inc | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc
> b/meta/recipes-devtools/rust/rust-cross-canadian.inc
> index d25646237c..5b89216658 100644
> --- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
> +++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
> @@ -55,9 +55,12 @@ do_install () {
> RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh"
>
> RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]'
> | sed 's/-/_/g'`
> +RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' |
> sed 's/-/_/g'`
> +SDKARCH=`echo ${SDK_ARCH} | sed 's/_/-/g'`
>
> cat <<- EOF > "${RUST_ENV_SETUP_SH}"
> export
> CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr
> -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT"
> + export
> CARGO_TARGET_${RUST_HOST_TRIPLE}_RUNNER="\$OECORE_NATIVE_SYSROOT/lib/ld-linux-${SDKARCH}.so.2"
> export
> RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib"
> EOF
>
> --
> 2.42.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188372):
https://lists.openembedded.org/g/openembedded-core/message/188372
Mute This Topic: https://lists.openembedded.org/mt/101633983/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] curl: Skip tests marked flaky
Thanks, I suspect many of those were enabled to begin with when I
recently changed the packaging to include all the tests.
Alex
On Thu, 28 Sept 2023 at 03:57, Robert Joslyn via
lists.openembedded.org
wrote:
>
> From: Robert Joslyn
>
> Some tests can fail intermittently and upstream has marked these as
> flaky so they can easily be skipped. At present there are 12 tests
> marked flaky with 10 of them running in the default recipe
> configuration. Skip them to avoid the failures.
>
> Signed-off-by: Robert Joslyn
> ---
> meta/recipes-support/curl/curl/run-ptest | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-support/curl/curl/run-ptest
> b/meta/recipes-support/curl/curl/run-ptest
> index 95af2bd7b3..8f9c20f34d 100644
> --- a/meta/recipes-support/curl/curl/run-ptest
> +++ b/meta/recipes-support/curl/curl/run-ptest
> @@ -1,6 +1,6 @@
> #!/bin/sh
> cd tests
> -{ ./runtests.pl -a -n -s -j4 || echo "FAIL: curl" ; } | sed \
> +{ ./runtests.pl -a -n -s -j4 !flaky || echo "FAIL: curl" ; } | sed \
> -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \
> -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|' \
> -e 's/Warning: test[0-9]\+ not present in tests\/data\/Makefile.inc//'
> --
> 2.41.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188371):
https://lists.openembedded.org/g/openembedded-core/message/188371
Mute This Topic: https://lists.openembedded.org/mt/101630676/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][RFC 1/2] rust-cross-canadian: set CARGO_TARGET__RUSTFLAGS
Avoid setting sdk-wide RUSTFLAGS as these flags only are valid when
building for target.
This will enable building for different targets with different
RUSTFLAGS.
Signed-off-by: Sean Nyekjaer
---
meta/recipes-devtools/rust/rust-cross-canadian.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc
b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index d569ac59f5..d25646237c 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -54,8 +54,10 @@ do_install () {
mkdir "${ENV_SETUP_DIR}"
RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh"
+RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' |
sed 's/-/_/g'`
+
cat <<- EOF > "${RUST_ENV_SETUP_SH}"
- export RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C
link-arg=--sysroot=\$OECORE_TARGET_SYSROOT"
+ export
CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr
-C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT"
export
RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib"
EOF
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188369):
https://lists.openembedded.org/g/openembedded-core/message/188369
Mute This Topic: https://lists.openembedded.org/mt/101633982/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[OE-core][RFC 2/2] rust-cross-canadian: set CARGO_TARGET__RUNNER for nativesdk
This will enable us to build and run rust programs on the sdk host.
% cargo run --target x86_64-oesdk-linux-gnu -vv
Fresh hello v0.1.0 (~/development/hello)
Finished dev [unoptimized + debuginfo] target(s) in 0.02s
Running
`/usr/local/sdk/sysroots/x86_64-oesdk-linux/lib/ld-linux-x86-64.so.2
target/x86_64-oesdk-linux-gnu/debug/hello`
Hello, world
Signed-off-by: Sean Nyekjaer
---
meta/recipes-devtools/rust/rust-cross-canadian.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc
b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index d25646237c..5b89216658 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -55,9 +55,12 @@ do_install () {
RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh"
RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' |
sed 's/-/_/g'`
+RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' | sed
's/-/_/g'`
+SDKARCH=`echo ${SDK_ARCH} | sed 's/_/-/g'`
cat <<- EOF > "${RUST_ENV_SETUP_SH}"
export
CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr
-C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT"
+ export
CARGO_TARGET_${RUST_HOST_TRIPLE}_RUNNER="\$OECORE_NATIVE_SYSROOT/lib/ld-linux-${SDKARCH}.so.2"
export
RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib"
EOF
--
2.42.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188370):
https://lists.openembedded.org/g/openembedded-core/message/188370
Mute This Topic: https://lists.openembedded.org/mt/101633983/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
