diff mbox series

[meta-oe,38/40] uftrace: upgrade 0.18 -> 0.18.1

Message ID 20250730232923.522-12-wangmy@fujitsu.com
State New
Headers show
Series None | expand

Commit Message

Wang Mingyu July 30, 2025, 11:29 p.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-build-Fix-a-build-error-on-i386.patch
removed since it's included in 0.18.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...0001-build-Fix-a-build-error-on-i386.patch | 26 -------------------
 .../{uftrace_0.18.bb => uftrace_0.18.1.bb}    |  5 ++--
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-error-on-i386.patch
 rename meta-oe/recipes-devtools/uftrace/{uftrace_0.18.bb => uftrace_0.18.1.bb} (91%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-error-on-i386.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-error-on-i386.patch
deleted file mode 100644
index c6bc8473b9..0000000000
--- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-error-on-i386.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From ea53a7f42c1c5da688ef79e53731dcc3810a1256 Mon Sep 17 00:00:00 2001
-From: Namhyung Kim <namhyung@gmail.com>
-Date: Sun, 6 Jul 2025 15:13:30 -0700
-Subject: [PATCH] build: Fix a build error on i386
-
-It happened to have common.S as well as common.c, so it picked the .S
-before .c for the uftrace-arch.a.  And it caused undefined symbols.
-
-  /usr/bin/ld: libmcount/symbol.op: in function `load_dynsymtab':
-  utils/symbol.c:722:(.text+0x2b19): undefined reference to `uftrace_arch_ops'
-  libmcount/symbol.op: in function `load_elf_dynsymtab':
-  utils/symbol.c:586:(.text+0x184a): undefined reference to `uftrace_arch_ops'
-
-Fixed: #2010
-
-Upstream-Status: Backport [https://github.com/namhyung/uftrace/commit/ea53a7f42c1c5da688ef79e53731dcc3810a1256]
-Signed-off-by: Namhyung Kim <namhyung@gmail.com>
----
- arch/i386/{common.S => thunk.S} | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename arch/i386/{common.S => thunk.S} (100%)
-
-diff --git a/arch/i386/common.S b/arch/i386/thunk.S
-similarity index 100%
-rename from arch/i386/common.S
-rename to arch/i386/thunk.S
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.18.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.18.1.bb
similarity index 91%
rename from meta-oe/recipes-devtools/uftrace/uftrace_0.18.bb
rename to meta-oe/recipes-devtools/uftrace/uftrace_0.18.1.bb
index 7ba2dcadc9..3725825e0e 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.18.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.18.1.bb
@@ -8,11 +8,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "elfutils"
 DEPENDS:append:libc-musl = " argp-standalone"
 
-SRCREV = "8ccd4f627569b0af122c8d1df98dc6813ab97a40"
+SRCREV = "6d006b71ac32e28b7829cc21ccc7bb9c10add964"
 SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https;tag=v${PV} \
            file://0001-include-libgen.h-for-basename.patch \
-           file://0001-build-Fix-a-build-error-on-i386.patch \
-          "
+           "
 
 LDFLAGS:append:libc-musl = " -largp"