Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
77dd77a84f
!25 add conflict perf version
From: @cherry530 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2024-12-26 09:39:37 +00:00
cherry530
d655f10727 add conflict perf version
Signed-off-by: cherry530 <707078654@qq.com>
2024-12-26 08:26:46 +08:00
openeuler-ci-bot
916d32b6ea
!13 Delete confilt with perf when the kernel is greater than 6.2
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-07-13 07:09:59 +00:00
lyn1001
4e50c3434a Delete confilt with perf when the kernel is greater than 6.2 2023-07-13 14:58:34 +08:00
openeuler-ci-bot
a8c20a214c
!10 [sync] PR-9: Add conflict with perf
From: @openeuler-sync-bot 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2023-02-23 11:27:30 +00:00
starlet-dx
3e3ff161fc Add conflict with perf
(cherry picked from commit ee3b9be8482ea0c92100f4016440e7fbc8835c32)
2023-02-23 17:23:51 +08:00
openeuler-ci-bot
4e0e18f5e8
!7 [sync] PR-6: 添加栈保护编译选项-fstack-protector-strong
From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2022-12-08 08:21:41 +00:00
cherry530
3c7d99fbbb Add -fstack-protector-stroong compile options
Signed-off-by: cherry530 <xuping33@huawei.com>
(cherry picked from commit a53b9562c12d55fcd960531acbb455baab805bd6)
2022-12-08 16:00:17 +08:00
openeuler-ci-bot
12f77f45f3
!1 Init libtraceevent
Merge pull request !1 from houyingchao/master
2022-01-14 09:14:28 +00:00
houyingchao
551ab31576 Init libtraceevent 2022-01-14 15:03:42 +08:00
3 changed files with 99 additions and 0 deletions

View File

@ -0,0 +1,26 @@
diff --git a/Makefile b/Makefile
index 089b621..3665e0f 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ INCLUDES = -I. -I $(srctree)/include $(CONFIG_INCLUDES)
ifdef EXTRA_CFLAGS
CFLAGS := $(EXTRA_CFLAGS)
else
- CFLAGS := -g -Wall
+ CFLAGS := -g -Wall -fstack-protector-strong
endif
LIBS = -ldl
diff --git a/plugins/Makefile b/plugins/Makefile
index b60352d..d5744a9 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -75,7 +75,7 @@ INCLUDES = -I. -I.. -I../src -I $(srctree)/include $(CONFIG_INCLUDES)
ifdef EXTRA_CFLAGS
CFLAGS := $(EXTRA_CFLAGS)
else
- CFLAGS := -g -Wall
+ CFLAGS := -g -Wall -fstack-protector-strong
endif
# Append required CFLAGS

BIN
libtraceevent-1.2.1.tar.gz Normal file

Binary file not shown.

73
libtraceevent.spec Normal file
View File

@ -0,0 +1,73 @@
Name: libtraceevent
Version: 1.2.1
Release: 5
License: LGPLv2+ and GPLv2+
Summary: Library to parse raw trace event formats
URL: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-%{version}.tar.gz
Patch0000: 0001-fix-missing-fstack-protector-strong.patch
BuildRequires: gcc
BuildRequires: xmlto
BuildRequires: asciidoc
Conflicts: perf < 6.2.0
%global __provides_exclude_from ^%{_libdir}/traceevent/plugins
%description
libtraceevent is a library to parse raw trace event formats.
%package devel
Summary: Development headers of %{name}
Requires: %{name}%{_isa} = %{version}-%{release}
%description devel
Development headers of %{name}-libs
%prep
%autosetup -n %{name}-%{version} -p1
%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
%install
%make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install
rm -rf %{buildroot}/%{_libdir}/libtraceevent.a
%files
%license LICENSES/LGPL-2.1
%license LICENSES/GPL-2.0
%{_libdir}/traceevent/
%{_libdir}/libtraceevent.so.%{version}
%{_libdir}/libtraceevent.so.1
%{_mandir}/man3/tep_*.3.*
%{_mandir}/man3/libtraceevent.3.*
%{_mandir}/man3/trace_seq*.3.*
%{_docdir}/%{name}-doc
%files devel
%{_includedir}/traceevent/
%{_libdir}/libtraceevent.so
%{_libdir}/pkgconfig/libtraceevent.pc
%changelog
* Wed Dec 25 2024 xu_ping <707078654@qq.com> - 1.2.1-5
- add conflict perf version.
* Thu Jul 13 2023 liyanan <thistleslyn@163.com> - 1.2.1-4
- Delete confilt with perf when the kernel is greater than 6.2
* Thu Jan 19 2023 yaoxin <yaoxin30@h-partners.com> - 1.2.1-3
- Add conflict with perf
* Mon Dec 05 2022 xu_ping <xuping33@h-partners.com> - 1.2.1-2
- Add -fstack-protector-strong compile options
* Fri Jan 14 2022 houyingchao <houyingchao@huawei.com> - 1.2.1-1
- Init package