import crash-trace-command-3.0-6.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
bf90674933
|
|
@ -0,0 +1 @@
|
|||
b9636e856f96e77b2047e12c3d87991ec88b067c SOURCES/crash-trace-command-3.0.tar.gz
|
||||
|
|
@ -0,0 +1 @@
|
|||
SOURCES/crash-trace-command-3.0.tar.gz
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 153629a96b07a8ae96b0b28cce100fde9ea1398d Mon Sep 17 00:00:00 2001
|
||||
From: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
Date: Thu, 28 Jan 2021 00:08:35 -0500
|
||||
Subject: [PATCH 1/2] Makefile: set DT_SONAME to trace.so
|
||||
|
||||
Fedora never requires SONAME versioning for plugins according to the
|
||||
Packaging Guidelines:
|
||||
|
||||
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_downstream_so_name_versioning
|
||||
|
||||
In cases where upstream ships unversioned .so library (so this is
|
||||
not needed for plugins, drivers, etc.), the packager MUST try to
|
||||
convince upstream to start versioning it.
|
||||
|
||||
On the other hand, fedpkg lint still prints warning if the shared
|
||||
library doesn't have DT_SONAME. To surpress this, we set DT_SONAME
|
||||
field to trace.so for in case.
|
||||
|
||||
Signed-off-by: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index a9e0a21..b4573b4 100755
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -28,4 +28,4 @@ INCDIR=/usr/include/crash
|
||||
all: trace.so
|
||||
|
||||
trace.so: $(INCDIR)/defs.h trace.c
|
||||
- gcc $(RPM_OPT_FLAGS) -Wall -I$(INCDIR) -nostartfiles -shared -rdynamic -o trace.so trace.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
|
||||
+ gcc $(RPM_OPT_FLAGS) -Wall -I$(INCDIR) -nostartfiles -shared -rdynamic -Wl,-z,now -Wl,-soname,trace.so -o trace.so trace.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
From 17c35d075f067d80fee112ae18365b8defa2ca5a Mon Sep 17 00:00:00 2001
|
||||
From: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
Date: Fri, 19 Feb 2021 11:38:59 +0900
|
||||
Subject: [PATCH 2/2] Makefile: fix build failure on aarch64 and ppc64le
|
||||
|
||||
Currently, there is build failure on aarch64 and ppc64le as follows:
|
||||
|
||||
gcc -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mcpu=power8 -mtune=power8 -fasynchronous-unwind-tables -fstack-clash-protection -Wall -I/usr/include/crash -nostartfiles -shared -rdynamic -o trace.so trace.c -fPIC -D
|
||||
gcc: error: macro name missing after '-D'
|
||||
|
||||
The failure is caused by missing arguments for -D option because
|
||||
TARGET variable is empty.
|
||||
|
||||
This commit fixes the issue by defining TARGET variable properly
|
||||
according to aarch64 and ppc64le.
|
||||
|
||||
Signed-off-by: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
---
|
||||
Makefile | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b4573b4..0d35d4f 100755
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -6,6 +6,10 @@ ifeq ($(shell arch), ppc64)
|
||||
TARGET=PPC64
|
||||
TARGET_CFLAGS=-m64
|
||||
endif
|
||||
+ifeq ($(shell arch), ppc64le)
|
||||
+ TARGET=PPC64
|
||||
+ TARGET_CFLAGS=-m64
|
||||
+endif
|
||||
ifeq ($(shell arch), ia64)
|
||||
TARGET=IA64
|
||||
TARGET_CFLAGS=
|
||||
@@ -22,6 +26,10 @@ ifeq ($(shell arch), s390)
|
||||
TARGET=S390
|
||||
TARGET_CFLAGS=
|
||||
endif
|
||||
+ifeq ($(shell arch), aarch64)
|
||||
+ TARGET=ARM64
|
||||
+ TARGET_CFLAGS=
|
||||
+endif
|
||||
|
||||
INCDIR=/usr/include/crash
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
%global reponame crash-trace
|
||||
|
||||
Summary: Trace extension module for the crash utility
|
||||
Name: crash-trace-command
|
||||
Version: 3.0
|
||||
Release: 6%{?dist}
|
||||
License: GPLv2
|
||||
Source: https://github.com/fujitsu/crash-trace/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
URL: https://github.com/fujitsu/crash-trace
|
||||
ExclusiveOS: Linux
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
BuildRequires: crash-devel >= 7.2.0-2
|
||||
BuildRequires: gcc
|
||||
Requires: trace-cmd
|
||||
Requires: crash >= 7.2.0-2
|
||||
|
||||
Patch0001: 0001-Makefile-set-DT_SONAME-to-trace.so.patch
|
||||
Patch0002: 0002-Makefile-fix-build-failure-on-aarch64-and-ppc64le.patch
|
||||
|
||||
%description
|
||||
Command for reading ftrace data from a dump file.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{reponame}-%{version}
|
||||
|
||||
%build
|
||||
%make_build
|
||||
|
||||
%install
|
||||
install -m 0755 -d %{buildroot}%{_libdir}/crash/extensions
|
||||
install -m 0755 -t %{buildroot}%{_libdir}/crash/extensions %{_builddir}/%{reponame}-%{version}/trace.so
|
||||
|
||||
%files
|
||||
%dir %{_libdir}/crash
|
||||
%dir %{_libdir}/crash/extensions
|
||||
%{_libdir}/crash/extensions/trace.so
|
||||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Wed Dec 15 2021 Lianbo Jiang <lijiang@redhat.com> - 3.0-6
|
||||
- Rebuild for the compatibility issue
|
||||
|
||||
* Thu Dec 09 2021 Lianbo Jiang <lijiang@redhat.com> - 3.0-5
|
||||
- Fix the hardening issue "FAIL: bind-now test because not linked with -Wl,-z,now"
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.0-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Fri Feb 19 2021 HATAYAMA Daisuke <d.hatayama@fujitsu.com> - 3.0-2
|
||||
- Makefile: set DT_SONAME to trace.so
|
||||
- Makefile: fix build failure on aarch64 and ppc64le
|
||||
* Fri Jan 22 2021 HATAYAMA Daisuke <d.hatayama@fujitsu.com> - 3.0-1
|
||||
- Initial crash-trace-command package
|
||||
Loading…
Reference in New Issue