diff mbox series

[meta-oe] uftrace: upgrade 0.13 -> 0.13.1

Message ID 1676879030-15591-2-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe] uftrace: upgrade 0.13 -> 0.13.1 | expand

Commit Message

Mingyu Wang (Fujitsu) Feb. 20, 2023, 7:43 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
removed since it's included in 0.13.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...d-race-related-to-utils-mermaid.html.patch | 38 -------------------
 .../{uftrace_0.13.bb => uftrace_0.13.1.bb}    |  6 +--
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
 rename meta-oe/recipes-devtools/uftrace/{uftrace_0.13.bb => uftrace_0.13.1.bb} (87%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
deleted file mode 100644
index 2cb4f26fb..000000000
--- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch
+++ /dev/null
@@ -1,38 +0,0 @@ 
-From 1fa61d77fa7173744dd6dc9d3c4bb0aa783f5222 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 21 Jan 2023 10:35:46 -0800
-Subject: [PATCH] build: Fix a build race related to utils/mermaid.html.cstr
-
-Sometimes build fails like below
-
-| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c: In function 'dump_mermaid_footer':
-| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/git/cmds/dump.c:1347:10: fatal error: utils/mermaid.html.cstr: No such file or directory
-|  1347 | #include "utils/mermaid.html.cstr" /* This file is a converted of mermaid.html to one string literal in build-time */
-|       |          ^~~~~~~~~~~~~~~~~~~~~~~~~
-| compilation terminated.
-| make[1]: *** [Makefile:310: /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/uftrace/0.13-r0/build/cmds/dump.o] Error 1
-
-Create a dependency on c-str-conversion for dump.o
-
-Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/1622]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 70dc12f0..bb2ac669 100644
---- a/Makefile
-+++ b/Makefile
-@@ -304,6 +304,8 @@ $(objdir)/misc/dbginfo.o: $(srcdir)/misc/dbginfo.c $(objdir)/version.h $(COMMON_
- $(objdir)/misc/bench.o: $(srcdir)/misc/bench.c
- 	$(QUIET_CC)$(CC) $(BENCH_CFLAGS) -c -o $@ $<
- 
-+$(objdir)/cmds/dump.o: c-str-conversion
-+
- $(UFTRACE_OBJS_VERSION): $(objdir)/version.h
- 
- $(filter-out $(objdir)/uftrace.o, $(UFTRACE_OBJS)): $(objdir)/%.o: $(srcdir)/%.c $(COMMON_DEPS)
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
similarity index 87%
rename from meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
rename to meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
index 130242098..4e1edc6ce 100644
--- a/meta-oe/recipes-devtools/uftrace/uftrace_0.13.bb
+++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.13.1.bb
@@ -10,10 +10,8 @@  DEPENDS:append:libc-musl = " argp-standalone"
 
 inherit autotools
 
-SRCREV = "53ec12d40701cf73ddcf5db8cff63b54736d0eda"
-SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https \
-           file://0001-build-Fix-a-build-race-related-to-utils-mermaid.html.patch \
-           "
+SRCREV = "be3f46f7656bd9243b1835337b5350247b030b02"
+SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https"
 S = "${WORKDIR}/git"
 
 LDFLAGS:append:libc-musl = " -largp"