rpms/trace-cmd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 2.6.1.

Browse Source
This commit is contained in:
Zamir SUN 2017-05-23 22:03:16 +08:00
parent 1418c1b573
commit dfd620c20f
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/trace-cmd-2.1.0.tar.gz /trace-cmd-2.1.0.tar.gz
/trace-cmd-2.2.1.tar.gz /trace-cmd-2.2.1.tar.gz
/trace-cmd-2.6.tar.gz /trace-cmd-2.6.tar.gz
/trace-cmd-2.6.1.tar.gz

2
sources
View File

@ -1 +1 @@
SHA512 (trace-cmd-2.6.tar.gz) = dc621d211b84c1d00b99954901d0c71ebe96bc4c825b0b0dde537f282529bf097ada5d089ebe7d702ab945747ef113155c27e8c10cb1428bed932da200f45934 SHA512 (trace-cmd-2.6.1.tar.gz) = 741281c8dc9355218932c6edc6b585de92ffc2b530744d13b4eb838ead8d2c6ec91fd25f39e590b50223c3425ae1cf2ec949f269335fc9d2b0cf1c4999751ec4

4
trace-cmd-2.6-libdir.patch
View File

@ -7,8 +7,8 @@ diff -up ./Makefile.orig ./Makefile
+# figure out what arch we are on and install to the right place +# figure out what arch we are on and install to the right place
+ARCH = $(shell getconf LONG_BIT) +ARCH = $(shell getconf LONG_BIT)
+LIBDIR_32 = lib +LIBDIR_32 = /usr/lib
+LIBDIR_64 = lib64 +LIBDIR_64 = /usr/lib64
+libdir=$(LIBDIR_$(ARCH)) +libdir=$(LIBDIR_$(ARCH))
+ +
+ +

11
trace-cmd.spec
View File

@ -1,11 +1,11 @@
#%global checkout 20170330git013205a8 #%global checkout 20170330git013205a8
# git tag # git tag
#%global git_commit trace-cmd-v2.6 #%global git_commit trace-cmd-v2.6
%global git_commit 013205a8f9e60998b39c106470957030585b5851 %global git_commit 021710e1073fe203341b427cd1a4bac577ec899c
Name: trace-cmd Name: trace-cmd
Version: 2.6 Version: 2.6.1
Release: 4.20170330git013205%{?dist} Release: 1%{?dist}
License: GPLv2 and LGPLv2 License: GPLv2 and LGPLv2
Summary: A user interface to Ftrace Summary: A user interface to Ftrace
@ -19,7 +19,6 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
Source0: trace-cmd-%{version}.tar.gz Source0: trace-cmd-%{version}.tar.gz
Source1: kernelshark.desktop Source1: kernelshark.desktop
Patch1: trace-cmd-2.6-libdir.patch Patch1: trace-cmd-2.6-libdir.patch
Patch2: bz1389219-segmentation-fault-in-trace-snapshot.patch
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: mlocate BuildRequires: mlocate
@ -46,7 +45,6 @@ Kernelshark is the GUI frontend for analyzing data produced by
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
@ -80,6 +78,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
%changelog %changelog
* Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6.1-1
- Rebase to 2.6.1.
* Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4.20170330git013205 * Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4.20170330git013205
- Rebase to newest upstream version to include various bug fixes. - Rebase to newest upstream version to include various bug fixes.