On Thu, Jan 22, 2026 at 12:29 AM wangmy via lists.openembedded.org
<[email protected]> wrote:
>
> From: Wang Mingyu <[email protected]>
>
> 0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
> revemoed since it's included in 1.31
>
> Signed-off-by: Wang Mingyu <[email protected]>
> ---
> ...r-Fix-elf_functions-cleanup-on-error.patch | 54 -------------------
> .../pahole/{pahole_1.29.bb => pahole_1.31.bb} | 4 +-
> 2 files changed, 2 insertions(+), 56 deletions(-)
> delete mode 100644
> meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
> rename meta-oe/recipes-devtools/pahole/{pahole_1.29.bb => pahole_1.31.bb}
> (88%)
>
> diff --git
> a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
>
> b/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
> deleted file mode 100644
> index dad5a9646a..0000000000
> ---
> a/meta-oe/recipes-devtools/pahole/files/0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From 6fa2b7de3e647e64c5d693aea7f3bacbfa964f53 Mon Sep 17 00:00:00 2001
> -From: Ihor Solodari <[email protected]>
> -Date: Wed, 20 Aug 2025 09:00:03 +0100
> -Subject: [PATCH] btf_encoder: Fix elf_functions cleanup on error
> -
> -When elf_functions__new() errors out and jumps to
> -elf_functions__delete(), pahole segfaults on attempt to list_del() the
> -elf_functions instance from a list, to which it was never added.
> -
> -Fix this by moving list_del() call out of elf_functions__delete().
> -Remove from the list only on normal cleanup in
> -elf_functions_list__clear().
> -
> -v1:
> -https://lore.kernel.org/dwarves/[email protected]/
> -
> -Closes:
> -https://lore.kernel.org/dwarves/[email protected]/
> -Reported-by: Changqing Li <[email protected]>
> -Signed-off-by: Ihor Solodrai <[email protected]>
> -Reviewed-by: Arnaldo Carvalho de Melo <[email protected]>
> -Link:
> https://lore.kernel.org/dwarves/[email protected]/
> -Signed-off-by: Alan Maguire <[email protected]>
> -
> -Upstream-Status: Backport
> [https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?h=next&id=fe6738f4b46b63dcdc5b15b252a014b3eaba16a4]
> -
> -Signed-off-by: Changqing Li <[email protected]>
> ----
> - btf_encoder.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/btf_encoder.c b/btf_encoder.c
> -index 511c1ea..2f8c6bb 100644
> ---- a/btf_encoder.c
> -+++ b/btf_encoder.c
> -@@ -162,7 +162,6 @@ static inline void elf_functions__delete(struct
> elf_functions *funcs)
> - free(funcs->entries[i].alias);
> - free(funcs->entries);
> - elf_symtab__delete(funcs->symtab);
> -- list_del(&funcs->node);
> - free(funcs);
> - }
> -
> -@@ -204,6 +203,7 @@ static inline void elf_functions_list__clear(struct
> list_head *elf_functions_lis
> -
> - list_for_each_safe(pos, tmp, elf_functions_list) {
> - funcs = list_entry(pos, struct elf_functions, node);
> -+ list_del(&funcs->node);
> - elf_functions__delete(funcs);
> - }
> - }
> ---
> -2.34.1
> -
> diff --git a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
> b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb
> similarity index 88%
> rename from meta-oe/recipes-devtools/pahole/pahole_1.29.bb
> rename to meta-oe/recipes-devtools/pahole/pahole_1.31.bb
> index 4f2737767b..ea4237c4aa 100644
> --- a/meta-oe/recipes-devtools/pahole/pahole_1.29.bb
> +++ b/meta-oe/recipes-devtools/pahole/pahole_1.31.bb
> @@ -9,10 +9,10 @@ DEPENDS = "elfutils zlib libbpf"
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> COMPATIBLE_HOST =
> "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"
>
> -SRCREV = "b9cc7963051b2099795129450f9b70c81950d02f"
> +SRCREV = "1f2805b6eef104df3125143c949b391f6122e5b9"
> SRC_URI =
> "git://git.kernel.org/pub/scm/devel/pahole/pahole.git;branch=master \
>
> file://0001-Use-usr-bin-env-python3-instead-of-just-usr-bin-pyth.patch \
> - file://0001-btf_encoder-Fix-elf_functions-cleanup-on-error.patch"
> + "
can please also include tag=v${PV} in the SRC_URI
>
>
> inherit cmake pkgconfig
> --
> 2.43.0
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#123735):
https://lists.openembedded.org/g/openembedded-devel/message/123735
Mute This Topic: https://lists.openembedded.org/mt/117379498/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
