diff --git a/0001-fix-missing-fstack-protector-strong.patch b/0001-fix-missing-fstack-protector-strong.patch index 37bf0fc66905f736f8532986e7ea1f5db821ce0b..ef850986e4183d0e2d44d7d8cff3b052ed4ff6c9 100644 --- a/0001-fix-missing-fstack-protector-strong.patch +++ b/0001-fix-missing-fstack-protector-strong.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 089b621..3665e0f 100644 +index 41ad866..20ae048 100644 --- a/Makefile +++ b/Makefile -@@ -113,7 +113,7 @@ INCLUDES = -I. -I $(srctree)/include $(CONFIG_INCLUDES) +@@ -127,7 +127,7 @@ export LIBTRACEEVENT_STATIC LIBTRACEEVENT_SHARED EP_HEADERS_DIR ifdef EXTRA_CFLAGS CFLAGS := $(EXTRA_CFLAGS) else @@ -10,12 +10,12 @@ index 089b621..3665e0f 100644 + CFLAGS := -g -Wall -fstack-protector-strong endif - LIBS = -ldl + LIBS ?= -ldl diff --git a/plugins/Makefile b/plugins/Makefile -index b60352d..d5744a9 100644 +index 4c8cb17..56b5646 100644 --- a/plugins/Makefile +++ b/plugins/Makefile -@@ -75,7 +75,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include $(CONFIG_INCLUDES) +@@ -68,7 +68,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include -I $(EP_HEADERS_DIR) $(CONFIG ifdef EXTRA_CFLAGS CFLAGS := $(EXTRA_CFLAGS) else diff --git a/README.md b/README.md index e62c3eebf07b59ded039eec4afa6ee60a4c0bbdf..a5413b8d1c0d10f0bdf3d1f8db5572e0c7aa415e 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,16 @@ Library to parse raw trace event formats #### 软件架构 -软件架构说明 +支持aarch64、x86_64 2种架构 #### 安装教程 -1. xxxx -2. xxxx -3. xxxx +1. rpm -ivh libtraceevent***.rpm #### 使用说明 -1. xxxx -2. xxxx -3. xxxx +1. 此软件仅提供动态库和静态库，没有二进制命令，使用方式参考man手册和libtraceevent-devel中的头文件 #### 参与贡献 @@ -25,13 +21,3 @@ Library to parse raw trace event formats 2. 新建 Feat_xxx 分支 3. 提交代码 4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/libtraceevent-1.2.1.tar.gz b/libtraceevent-1.2.1.tar.gz deleted file mode 100644 index e39e27c758a40ee32826199dcc78d659a1db256a..0000000000000000000000000000000000000000 Binary files a/libtraceevent-1.2.1.tar.gz and /dev/null differ diff --git a/libtraceevent-1.8.4.tar.gz b/libtraceevent-1.8.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b9cc2372912b1b3aeb54bde1587415fca277e517 Binary files /dev/null and b/libtraceevent-1.8.4.tar.gz differ diff --git a/libtraceevent.spec b/libtraceevent.spec index 670cc0efc0e16d4db6f69ced8106c931c6574a34..7cafbfb57c83e7ce27550b5a358980dbc859b547 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -1,6 +1,6 @@ Name: libtraceevent -Version: 1.2.1 -Release: 5 +Version: 1.8.4 +Release: 2 License: LGPLv2+ and GPLv2+ Summary: Library to parse raw trace event formats @@ -32,8 +32,8 @@ Development headers of %{name}-libs %build MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl` -%set_build_flags -%make_build prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc +# Parallel build does not work +make -O -j1 V=1 VERBOSE=1 CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc %install %make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install @@ -45,9 +45,10 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/traceevent/ %{_libdir}/libtraceevent.so.%{version} %{_libdir}/libtraceevent.so.1 -%{_mandir}/man3/tep_*.3.* -%{_mandir}/man3/libtraceevent.3.* -%{_mandir}/man3/trace_seq*.3.* +%{_mandir}/man3/tep_*.3* +%{_mandir}/man3/libtraceevent.3* +%{_mandir}/man3/trace_seq*.3* +%{_mandir}/man3/kbuffer_*.3* %{_docdir}/%{name}-doc %files devel @@ -56,9 +57,19 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/pkgconfig/libtraceevent.pc %changelog -* Wed Dec 25 2024 xu_ping <707078654@qq.com> - 1.2.1-5 +* Wed Dec 25 2024 xu_ping <707078654@qq.com> - 1.8.4-2 - add conflict perf version. +* Mon Dec 02 2024 xu_ping <707078654@qq.com> - 1.8.4-1 +- update to 1.8.4 + * Add meson build targets to Makefile + * Close shared object in the error path of load_plugin() + * prevent a memory leak in tep_plugin_add_option() + * Prevent a memory leak in process_fields() + +* Sun Jun 30 2024 shafeipaozi - 1.8.2-1 +- update to 1.8.2 + * Thu Jul 13 2023 liyanan - 1.2.1-4 - Delete confilt with perf when the kernel is greater than 6.2