Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 42f5867437 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/libkdumpfile-0.5.5.tar.gz
|
||||
libkdumpfile-0.5.4.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
f42106feef26c2fdc5d217176734d412efd13ebc SOURCES/libkdumpfile-0.5.5.tar.gz
|
||||
@ -1,48 +0,0 @@
|
||||
commit cc927b9e22ebe6de1a6ed23ca8d14d1f3d790fb5
|
||||
Author: Petr Tesarik <petr@tesarici.cz>
|
||||
Date: Fri Dec 27 12:17:35 2024 +0100
|
||||
|
||||
tests: Fix xlat-linux-x86_64-6.11-pti-user-ver with parallel runs
|
||||
|
||||
The xlat-linux-x86_64-6.11-pti-user and xlat-linux-x86_64-6.11-pti-user-ver
|
||||
test cases use the same input files, but the logic is flawed, because they
|
||||
also use the same output file names. That fails if both run in parallel.
|
||||
|
||||
Fixes: #85
|
||||
Signed-off-by: Petr Tesarik <petr@tesarici.cz>
|
||||
|
||||
diff --git a/tests/xlat-linux-x86_64-6.11-pti-user-ver b/tests/xlat-linux-x86_64-6.11-pti-user-ver
|
||||
index 43d500d..427985b 100755
|
||||
--- a/tests/xlat-linux-x86_64-6.11-pti-user-ver
|
||||
+++ b/tests/xlat-linux-x86_64-6.11-pti-user-ver
|
||||
@@ -14,5 +14,5 @@ opts=(
|
||||
osver=0x060b00
|
||||
)
|
||||
|
||||
-name=xlat-linux-x86_64-6.11-pti-user
|
||||
+srcname=xlat-linux-x86_64-6.11-pti-user
|
||||
. "$srcdir"/xlat-os-common
|
||||
diff --git a/tests/xlat-os-common b/tests/xlat-os-common
|
||||
index a308a74..7dcdee9 100644
|
||||
--- a/tests/xlat-os-common
|
||||
+++ b/tests/xlat-os-common
|
||||
@@ -4,13 +4,14 @@
|
||||
|
||||
mkdir -p out || exit 99
|
||||
|
||||
-if [ -z "$name" ]; then
|
||||
- name=$( basename "$0" )
|
||||
+name=$( basename "$0" )
|
||||
+if [ -z "$srcname" ]; then
|
||||
+ srcname="$name"
|
||||
fi
|
||||
resultfile="out/${name}.result"
|
||||
-expectfile="$srcdir/$name.expect"
|
||||
-symfile="$srcdir/$name.sym"
|
||||
-datafile="$srcdir/$name.data"
|
||||
+expectfile="$srcdir/$srcname.expect"
|
||||
+symfile="$srcdir/$srcname.sym"
|
||||
+datafile="$srcdir/$srcname.data"
|
||||
cfgfile="out/${name}.cfg"
|
||||
|
||||
optspec=
|
||||
45
libkdumpfile-c99.patch
Normal file
45
libkdumpfile-c99.patch
Normal file
@ -0,0 +1,45 @@
|
||||
Python 3 does not have a tp_print member in PyTypeObject
|
||||
|
||||
This avoids an int-conversion compiler error with current compilers:
|
||||
|
||||
./kdumpfile.c:1449:9: error: initialization of 'long int' from 'int (*)(PyObject *, FILE *, int)' {aka 'int (*)(struct _object *, FILE *, int)'} makes integer from pointer without a cast
|
||||
1449 | attr_dir_print, /* tp_print*/
|
||||
| ^~~~~~~~~~~~~~
|
||||
|
||||
In Python 3.11, the field at this position is called
|
||||
tp_vectorcall_offset and has type Py_ssize_t, hence the error.
|
||||
|
||||
Submitted upstream: <https://github.com/ptesarik/libkdumpfile/pull/78>
|
||||
|
||||
diff --git a/python/kdumpfile.c b/python/kdumpfile.c
|
||||
index 7c5917522ef05539..332318e76f317dff 100644
|
||||
--- a/python/kdumpfile.c
|
||||
+++ b/python/kdumpfile.c
|
||||
@@ -1143,7 +1143,6 @@ attr_dir_repr(PyObject *_self)
|
||||
Py_XDECREF(colon);
|
||||
return result;
|
||||
}
|
||||
-#endif
|
||||
|
||||
static int
|
||||
attr_dir_print(PyObject *_self, FILE *fp, int flags)
|
||||
@@ -1214,6 +1213,7 @@ attr_dir_print(PyObject *_self, FILE *fp, int flags)
|
||||
kdump_attr_iter_end(ctx, &iter);
|
||||
return -1;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static PyObject *
|
||||
attr_iterkey_new(PyObject *_self)
|
||||
@@ -1446,7 +1446,11 @@ static PyTypeObject attr_dir_object_type =
|
||||
sizeof(char), /* tp_itemsize*/
|
||||
/* methods */
|
||||
attr_dir_dealloc, /* tp_dealloc*/
|
||||
+#if PY_MAJOR_VERSION < 3
|
||||
attr_dir_print, /* tp_print*/
|
||||
+#else
|
||||
+ 0,
|
||||
+#endif
|
||||
0, /* tp_getattr*/
|
||||
0, /* tp_setattr*/
|
||||
0, /* tp_compare*/
|
||||
@ -1,37 +1,34 @@
|
||||
%if 0%{?fedora} >= 42 || 0%{?rhel} >= 10
|
||||
# Python bindings removed post-0.5.5
|
||||
# see commit 40c9ff981f1f3bd968af37a50b50c3478d8267cd
|
||||
%bcond_with python
|
||||
%else
|
||||
%bcond_without python
|
||||
%endif
|
||||
## START: Set by rpmautospec
|
||||
## (rpmautospec version 0.6.1)
|
||||
## RPMAUTOSPEC: autorelease, autochangelog
|
||||
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
|
||||
release_number = 5;
|
||||
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
|
||||
print(release_number + base_release_number - 1);
|
||||
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
|
||||
## END: Set by rpmautospec
|
||||
|
||||
%global mainlibsover 12
|
||||
%global mainlibsover 10
|
||||
%global addrlibsover 3
|
||||
|
||||
Name: libkdumpfile
|
||||
Version: 0.5.5
|
||||
Release: 1%{?dist}
|
||||
Version: 0.5.4
|
||||
Release: %autorelease
|
||||
Summary: Kernel coredump file access
|
||||
|
||||
License: LGPL-3.0-or-later OR GPL-2.0-or-later
|
||||
URL: https://github.com/ptesarik/libkdumpfile
|
||||
Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: fix_xlat-linux-x86_64-6.11-pti-user-ver_test.patch
|
||||
Patch0: libkdumpfile-c99.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: make
|
||||
BuildRequires: sed
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: lzo-devel
|
||||
%if %{with python}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%else
|
||||
Obsoletes: python3-libkdumpfile < 0.5.5-1
|
||||
%endif
|
||||
BuildRequires: snappy-devel
|
||||
BuildRequires: zlib-devel
|
||||
|
||||
@ -64,7 +61,6 @@ Obsoletes: %{name}-doc < 0.5.2-1
|
||||
|
||||
The %{name}-doc package contains documentation for %{name}.
|
||||
|
||||
%if %{with python}
|
||||
%package -n python3-%{name}
|
||||
Summary: Python bindings for %{name}
|
||||
Obsoletes: %{name}-python < 0.4.0-6
|
||||
@ -75,7 +71,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description -n python3-%{name} %{_description}
|
||||
|
||||
The python3-%{name} package contains Python bindings for %{name}.
|
||||
%endif
|
||||
|
||||
%package util
|
||||
Summary: Utilities to read kernel core dumps
|
||||
@ -92,12 +87,7 @@ sed -e "\|#!/usr/bin/env python|d" -i python/*/*.py
|
||||
|
||||
|
||||
%build
|
||||
%configure \
|
||||
%if %{without python}
|
||||
--with-python=no \
|
||||
%endif
|
||||
%{nil}
|
||||
|
||||
%configure
|
||||
%{__make} doxygen-doc
|
||||
%make_build
|
||||
|
||||
@ -131,36 +121,37 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
||||
%license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
|
||||
%doc doc/html
|
||||
|
||||
%if %{with python}
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/%{name}-%{version}-*.egg-info
|
||||
%{python3_sitearch}/addrxlat/
|
||||
%{python3_sitearch}/_addrxlat.*.so
|
||||
%{python3_sitearch}/kdumpfile/
|
||||
%{python3_sitearch}/_kdumpfile.*.so
|
||||
%endif
|
||||
|
||||
%files util
|
||||
%{_bindir}/dumpattr
|
||||
%{_bindir}/kdumpid
|
||||
%{_bindir}/listxendoms
|
||||
%{_bindir}/showxlat
|
||||
%{_mandir}/man1/kdumpid.1*
|
||||
|
||||
%changelog
|
||||
* Fri May 16 2025 Philipp Rudo <prudo@redhat.com> - 0.5.5-1
|
||||
- Rebase to upstream v0.5.5
|
||||
Resolves: RHEL-86262
|
||||
## START: Generated by rpmautospec
|
||||
* Thu May 02 2024 Philipp Rudo <prudo@redhat.com> - 0.5.4-5
|
||||
- Add gating.yaml to RHEL10 libkdumpfile
|
||||
|
||||
* Tue Nov 12 2024 Philipp Rudo <prudo@redhat.com> - 0.5.4-1
|
||||
- Rebase to upstream v0.5.4
|
||||
Resolves: RHEL-67143
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed May 15 2024 Tao Liu <ltao@redhat.com> - 0.5.2-4
|
||||
- Add tests/ directory
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri May 03 2024 Philipp Rudo <prudo@redhat.com> - 0.5.2-3
|
||||
- Add gating.yaml to RHEL9 libkdumpfile
|
||||
* Thu Jan 04 2024 Florian Weimer <fweimer@redhat.com> - 0.5.4-2
|
||||
- More complete Python 3 port for improved C compatibility
|
||||
|
||||
* Tue Nov 28 2023 Michel Lind <salimma@fedoraproject.org> - 0.5.4-1
|
||||
- Update to 0.5.4
|
||||
|
||||
* Fri Nov 10 2023 Michel Lind <salimma@fedoraproject.org> - 0.5.3-1
|
||||
- Update to 0.5.3
|
||||
|
||||
* Wed Jul 26 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.5.2-1
|
||||
- Update to 0.5.2
|
||||
@ -226,3 +217,16 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.4.0-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Fri Apr 2 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 0.4.0-2
|
||||
- Fix license
|
||||
|
||||
* Fri Feb 26 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 0.4.0-1
|
||||
- Initial package
|
||||
|
||||
## END: Generated by rpmautospec
|
||||
Loading…
Reference in New Issue
Block a user