Compare commits

...

10 Commits

Author SHA1 Message Date
Michael Petlan 90139aa182 Disable parallel building and rebuild again 2023-05-18 14:52:15 +00:00
Michael Petlan 7f3fa6c293 Rebuild due to brew environment issues
Related: rhbz#2134397

Signed-off-by: Michael Petlan <mpetlan@redhat.com>
2022-10-14 09:40:39 +02:00
Michael Petlan ad49eaccff Rebase to upstream v1.5.3
Related: rhbz#2075213

Signed-off-by: Michael Petlan <mpetlan@redhat.com>
2022-08-30 15:10:04 +02:00
Michael Petlan 3b89f9d836 Harden linking to meet annocheck requirements
The %install phase resets the flags unfortunately. That wouldn't matter,
however, in this case, second "building pass" clobbers the binaries that
come from the first pass. If we use the flags only in %build phase, they
will take no effect.

Resolves: rhbz#2037125
Signed-off-by: Michael Petlan <mpetlan@redhat.com>
2022-01-14 16:54:02 +01:00
Jerome Marchand da5db2aa83 Fix rpminspect annocheck failure
The rpminspect annocheck tool detected that plugins are not compiled
with the proper flags. For some reason, CFLAGS is ignored when
building plugins, but not EXTRA_CFLAGS. This is needed for gating.

Related: rhbz#1978504

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
2021-11-19 17:18:38 +01:00
Jerome Marchand 7869a7598a Fixes misc trace-cmd profile warnings
Related: rhbz#1978504

Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
2021-11-11 10:50:30 +01:00
Mohan Boddu 71f1ca019c Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2021-08-09 21:48:30 +00:00
Qiao Zhao c18cbbdc50 enable RHEL-9 gating for libtraceevent - Resolves: rhbz#1975146
Resolves: rhbz#1975146

Signed-off-by: Qiao Zhao <qzhao@redhat.com>
2021-06-25 10:45:22 +08:00
Michael Petlan bec72de4b3 Remove conflict for perf
Resolves: bz1957733

Signed-off-by: Michael Petlan <mpetlan@redhat.com>
2021-05-06 13:27:26 +02:00
Jerome Marchand d2909581c8 Rebuilt with libtracefs, trace-cmd and kernelshark
Related: rhbz#1947392
2021-04-21 15:06:24 +02:00
7 changed files with 94 additions and 7 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/libtraceevent-1.1.1.tar.gz
/libtraceevent-1.5.3.tar.gz

1
.libtraceevent.metadata Normal file
View File

@ -0,0 +1 @@
72d2ca781728169d9b17679b890f496d4c303040 libtraceevent-1.5.3.tar.gz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -4,8 +4,8 @@
#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
Name: libtraceevent
Version: 1.1.1
Release: 2%{?dist}
Version: 1.5.3
Release: 3%{?dist}
License: LGPLv2+ and GPLv2+
Summary: Library to parse raw trace event formats
@ -16,11 +16,10 @@ URL: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/
# git archive --prefix=libtraceevent-%%{version}/ -o libtraceevent-%%{version}.tar.gz %%{git_commit}
#Source0: libtraceevent-%%{version}.tar.gz
Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: xmlto
BuildRequires: asciidoc
# The libtraceevent is meant to be used by perf, trace-cmd etc. in the future, before it's ready in perf, let's add a conflict
Conflicts: perf
%global __provides_exclude_from ^%{_libdir}/traceevent/plugins
@ -36,14 +35,21 @@ Requires: %{name}%{_isa} = %{version}-%{release}
Development headers of %{name}-libs
%prep
%setup -q
%autosetup -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
#looks like CFLAGS is ignored when compiling plugins, but not EXTRA_CFLAGS
export EXTRA_CFLAGS="%{optflags}"
export LDFLAGS="-Wl,-z,now"
make -O -j1 V=1 VERBOSE=1 prefix=%{_prefix} libdir=%{_libdir} MANPAGE_XSL=%{MANPAGE_DOCBOOK_XSL} all doc
%install
%set_build_flags
#looks like CFLAGS is ignored when compiling plugins, but not EXTRA_CFLAGS
export EXTRA_CFLAGS="%{optflags}"
export LDFLAGS="-Wl,-z,now"
%make_install prefix=%{_prefix} libdir=%{_libdir} install doc-install
rm -rf %{buildroot}/%{_libdir}/libtraceevent.a
@ -64,6 +70,38 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a
%{_libdir}/pkgconfig/libtraceevent.pc
%changelog
* Wed Oct 19 2022 Michael Petlan <mpetlan@redhat.com> - 1.5.3-3
- Rebuild due to broken brew build again, disable parallel build
Related: rhbz#2134397
* Fri Oct 14 2022 Michael Petlan <mpetlan@redhat.com> - 1.5.3-2
- Rebuild due to broken brew environment
Related: rhbz#2134397
* Tue Aug 30 2022 Michael Petlan <mpetlan@redhat.com> - 1.5.3-1
- Rebase to v1.5.3
Related: rhbz#2075213
* Fri Jan 14 2022 Michael Petlan <mpetlan@redhat.com> - 1.1.1-8
- Harden linking to meet annocheck requirements
Related: rhbz#2037125
* Fri Nov 19 2021 Jerome Marchand <jmarchan@redhat.com> - 1.1.1-7
- Fix rpminspect annocheck issue.
* Tue Oct 26 2021 Jerome Marchand <jmarchan@redhat.com> - 1.1.1-6
- Handle parsing of "(REC)->" case
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu May 6 2021 Michael Petlan <mpetlan@redhat.com> - 1.1.1-4
- Remove conflict to enable perf linking. Resolves: rhbz#1957733
* Wed Apr 21 2021 Jerome Marchand <jmarchan@redhat.com> - 1.1.1-3
- Multi-build with libtracefs, trace-cmd and kernelshark
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

View File

@ -1 +1 @@
SHA512 (libtraceevent-1.1.1.tar.gz) = 659f4666c987514d9b101761203a61fe2d0fc9c7d6d7236e6cb84962bc7a8a0ac80e4b0a2d95c721f453f25327bef5b9e4104b30324b48e459dd1b455550d90e
SHA512 (libtraceevent-1.5.3.tar.gz) = 87cd8dbb51603e6d9f7fbc42f62175b4a1837d26bcfd187ac37afadfd34e7387d24322aaa6ac8e635755e905a4521a8a1b6c099dc983f5b248a1aefcd4a6f261

30
tests/scripts/run_tests.sh Executable file
View File

@ -0,0 +1,30 @@
#!/usr/bin/bash
if rpm -q --quiet libtraceevent; then
:
else
sudo dnf install -y libtraceevent
if [[ $? != 0 ]]; then
echo "install of libtraceevent failed!"
exit 1
fi
fi
echo "libtraceevent is a library to parse raw trace event formats. Check installation."
if [[ ! -f /usr/lib64/libtraceevent.so.1 ]]; then
echo "/usr/lib64/libtraceevent.so.1 not found!"
exit 2
fi
echo "Check the trace-cmd works."
if ! rpm -q --quiet trace-cmd; then
sudo dnf install -y trace-cmd
if [[ $? != 0 ]]; then
echo "install trace-cmd failed when libtraceevent exist!"
exit 3
fi
fi
trace-cmd list || exit 4
exit 0

11
tests/tests.yml Normal file
View File

@ -0,0 +1,11 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- simple:
dir: scripts
run: ./run_tests.sh
required_packages:
- libtraceevent trace-cmd