mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-09-27 12:40:19 +00:00
Code Issues Projects Releases Wiki Activity

sysprof: upgrade 48.1 -> 51.0

Browse Source 
The environ shadowing fix and the .debug directory lookup in the ELF
loader are part of the release now; refresh the remaining icon cache
patch.

51.0 installs a session D-Bus service file, so ship it.

AI-Generated: Uses Claude Code (Claude Opus 5)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Markus Volk
2026-09-21 08:13:52 -07:00
committed by Khem Raj
parent 6f735ce8ac
commit 78616c32f2
4 changed files with 6 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch
+4 -4
View File
@@ -15,12 +15,12 @@ Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 783f558..8775fe6 100644
index 339b1c3..bd5bda6 100644
--- a/meson.build
+++ b/meson.build
@@ -276,7 +276,7 @@ configure_file(
configuration: config_h
)
@@ -280,7 +280,7 @@ if get_option('docs')
subdir('doc')
endif
-if get_option('gtk') and gnome.found()
+if get_option('gtk') and gnome.found() and not meson.is_cross_build()
meta-gnome/recipes-gnome/sysprof/sysprof/0004-sysprof-greeter-fix-environ-with-shadowing.patch
-37
View File
@@ -1,37 +0,0 @@
From f65c492e93db122ac9623c7b0ee590801f90e366 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 11 Aug 2025 14:10:08 -0700
Subject: [PATCH] sysprof/greeter: fix environ with shadowing
Fixes: #150
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/issues/150]
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
---
src/sysprof/sysprof-greeter.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sysprof/sysprof-greeter.c b/src/sysprof/sysprof-greeter.c
index 5f44cb6..80e07ae 100644
--- a/src/sysprof/sysprof-greeter.c
+++ b/src/sysprof/sysprof-greeter.c
@@ -626,14 +626,14 @@ sysprof_greeter_init (SysprofGreeter *self)
if (self->recording_template)
{
- g_auto(GStrv) environ = NULL;
+ g_auto(GStrv) environ_ = NULL;
g_object_get (self->recording_template,
- "environ", &environ,
+ "environ", &environ_,
NULL);
- if (environ)
+ if (environ_)
{
- for (guint i = 0; environ[i]; i++)
- gtk_string_list_append (self->envvars, environ[i]);
+ for (guint i = 0; environ_[i]; i++)
+ gtk_string_list_append (self->envvars, environ_[i]);
}
}
meta-gnome/recipes-gnome/sysprof/sysprof/0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch
-47
View File
@@ -1,47 +0,0 @@
From 9c35912dba0597a241e9af4fe5c87bfc0931c46c Mon Sep 17 00:00:00 2001
From: Pawel Lampe <plampe@igalia.com>
Date: Fri, 16 May 2025 14:31:29 +0200
Subject: [PATCH] Make elf loader search for debug links in .debug dirs
When the distribution is built using yocto project, it's possible
to specify 'dbg-pkgs' image feature, see:
https://docs.yoctoproject.org/dev/ref-manual/features.html
This image feature makes files with package debug symbols being
placed under .debug directories accompanying the original binary
directories and mentioned in the .gnu_debuglink of the original binary.
Effectively the symbols of e.g. /x/y/libz.so will be placed in
/x/y/.debug/libz.so.
This change makes sysprof's elf loader to search for debug links
in such a .debug directories.
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/140]
---
src/libsysprof/sysprof-elf-loader.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/libsysprof/sysprof-elf-loader.c b/src/libsysprof/sysprof-elf-loader.c
index 2e52e26..e0b4089 100644
--- a/src/libsysprof/sysprof-elf-loader.c
+++ b/src/libsysprof/sysprof-elf-loader.c
@@ -336,6 +336,7 @@ sysprof_elf_loader_annotate (SysprofElfLoader *self,
g_autofree char *directory_name = NULL;
g_autofree char *debug_path = NULL;
g_autofree char *short_debug_path = NULL;
+ g_autofree char *shorter_debug_path = NULL;
const char *short_directory_name;
const char *debug_dir = self->debug_dirs[i];
const char *build_id;
@@ -360,6 +361,12 @@ sysprof_elf_loader_annotate (SysprofElfLoader *self,
sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf));
return;
}
+ shorter_debug_path = g_build_filename (directory_name, ".debug", debug_link, NULL);
+ if ((debug_link_elf = sysprof_elf_loader_load (self, mount_namespace, shorter_debug_path, build_id, 0, NULL)))
+ {
+ sysprof_elf_set_debug_link_elf (elf, get_deepest_debuglink (debug_link_elf));
+ return;
+ }
}
}
meta-gnome/recipes-gnome/sysprof/sysprof_48.1.bb → meta-gnome/recipes-gnome/sysprof/sysprof_51.0.bb
+2 -3
View File
@@ -21,10 +21,8 @@ DEPENDS += " \
SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch \
file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \
file://0003-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \
file://0004-sysprof-greeter-fix-environ-with-shadowing.patch \
file://0005-Make-elf-loader-search-for-debug-links-in-.debug-dir.patch \
"
SRC_URI[archive.sha256sum] = "54f157fdfef1edf1e2f22e542c462d90e1c21fca8c30eba4127cee739039bbe2"
SRC_URI[archive.sha256sum] = "f2c8d9c5c8294ce3fdc8be7d9f4be56a72ed71522cb54987f1723a8cfd91637d"
# reason: gtk4 requires opengl distro feature
REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk', 'opengl', '', d)}"
@@ -45,6 +43,7 @@ FILES_SOLIBSDEV = "${libdir}/libsysprof-6.so"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof3.service', '', d)}"
FILES:${PN} += " \
${datadir}/dbus-1/services \
${datadir}/dbus-1/system-services \
${datadir}/dbus-1/system.d \
${datadir}/dbus-1/interfaces \