diff --git a/0001-Fix-for-popen-cannot-deal-stderr.patch b/0001-Fix-for-popen-cannot-deal-stderr.patch new file mode 100644 index 0000000000000000000000000000000000000000..87273cfa6f51257ddc556f8dd3e71d160b01c30a --- /dev/null +++ b/0001-Fix-for-popen-cannot-deal-stderr.patch @@ -0,0 +1,33 @@ +From 9151cbdf6b820e3da6bd7df6b1ef5248f7bc43a1 Mon Sep 17 00:00:00 2001 +From: htpeng +Date: Tue, 28 Mar 2023 15:43:25 +0800 +Subject: [PATCH] Fix for popen() cannot deal stderr + +Signed-off-by: htpeng +--- + src/probes/virtualized_infos.probe/virt_proc.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/probes/virtualized_infos.probe/virt_proc.c b/src/probes/virtualized_infos.probe/virt_proc.c +index d5972a5..b52c63e 100644 +--- a/src/probes/virtualized_infos.probe/virt_proc.c ++++ b/src/probes/virtualized_infos.probe/virt_proc.c +@@ -72,7 +72,7 @@ static int is_virsh_installed(void) + char line[LINE_BUF_LEN]; + int is_installed = 0; + +- if (do_read_line("which virsh", line) < 0) { ++ if (do_read_line("which virsh 2>&1", line) < 0) { + ERROR("[VIRT_PROC] find virsh failed.\n"); + return -1; + } +@@ -199,4 +199,4 @@ int virt_proc_init(void) + { + g_host_type_is_pm = 0; + is_host_type_pm(&g_host_type_is_pm); +-} +\ No newline at end of file ++} +-- +2.34.1 + diff --git a/gala-gopher.spec b/gala-gopher.spec index 30673f93c4f4cb4d77c03d78d351ad7866191115..079facc5a29169c52427ad4cfe505473b43d5bc3 100644 --- a/gala-gopher.spec +++ b/gala-gopher.spec @@ -6,7 +6,7 @@ Summary: Intelligent ops toolkit for openEuler Name: gala-gopher Version: 1.0.2 -Release: 1 +Release: 2 License: Mulan PSL v2 URL: https://gitee.com/openeuler/gala-gopher Source: %{name}-%{version}.tar.gz @@ -20,6 +20,8 @@ Requires: bash glibc elfutils zlib bpftool dmidecode Requires: python3-psycopg2 python3-yaml flamegraph iproute libcurl Requires: libbpf >= 2:0.3 kmod net-tools ethtool +Patch1: 0001-Fix-for-popen-cannot-deal-stderr.patch + %description gala-gopher is a low-overhead eBPF-based probes framework @@ -78,6 +80,9 @@ fi /usr/lib/systemd/system/gala-gopher.service %changelog +* Tue Mar 28 2023 Peng Haitao - 1.0.2-2 +- fix for popen() cannot deal stderr + * Fri Mar 3 2023 Tangxin Xie - 1.0.2-1 - update to 1.0.2