diff --git a/makedumpfile-1.7.2.tar.gz b/makedumpfile-1.7.2.tar.gz deleted file mode 100644 index ce56791..0000000 --- a/makedumpfile-1.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:748583ea4c0b32346008aa53b313e9708f60a8481959c25c76e5c94740032d9b -size 205595 diff --git a/makedumpfile-1.7.3.tar.gz b/makedumpfile-1.7.3.tar.gz new file mode 100644 index 0000000..2e3217a --- /dev/null +++ b/makedumpfile-1.7.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f059dbebf5156a9ab97cd3c1f41ad5df3436c7ab4dd6dbffa234fc4e93cfa2ce +size 206343 diff --git a/makedumpfile-eppic-v5.0.patch b/makedumpfile-eppic-v5.0.patch new file mode 100644 index 0000000..20dc62b --- /dev/null +++ b/makedumpfile-eppic-v5.0.patch @@ -0,0 +1,34 @@ +diff --git a/extension_eppic.c b/extension_eppic.c +index 45bc032..4d30e6f 100644 +--- a/extension_eppic.c ++++ b/extension_eppic.c +@@ -308,12 +308,6 @@ apigetrtype(ull idx, type_t *t) + return drilldown(idx, t); + } + +-static int +-apialignment(ull idx) +-{ +- return 0; +-} +- + int + apigetval(char *name, ull *val, VALUE_S *value) + { +@@ -340,7 +334,7 @@ apigetval(char *name, ull *val, VALUE_S *value) + + eppic_pushref(stype, 1); + eppic_setmemaddr(value, *val); +- eppic_do_deref(1, value, value); ++ eppic_do_deref(value, value); + + *val = eppic_getval(value); + +@@ -415,7 +409,6 @@ apiops icops = { + apimember, + apigetctype, + apigetrtype, +- apialignment, + apigetval, + apigetenum, + apigetdefs, diff --git a/makedumpfile.changes b/makedumpfile.changes index aa2041c..3467725 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 25 10:42:06 UTC 2023 - Petr Tesařík + +- update to 1.7.3: + * Support kernels up to v6.3 (x86_64) + * Support sadump with 5-level paging +- temporarily disable eppic until v5.0 branch can be supported + ------------------------------------------------------------------- Sat Dec 3 21:34:25 UTC 2022 - Dirk Müller diff --git a/makedumpfile.spec b/makedumpfile.spec index 31680a4..b443949 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -1,7 +1,7 @@ # # spec file for package makedumpfile # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +%define build_eppic 0 + %if 0%{!?have_snappy:1} %if 0%{?suse_version} >= 1310 %define have_snappy 1 @@ -40,7 +42,7 @@ # End of compatibility cruft Name: makedumpfile -Version: 1.7.2 +Version: 1.7.3 Release: 0 Summary: Partial kernel dump License: GPL-2.0-only @@ -51,10 +53,13 @@ Source99: %{name}-rpmlintrc Patch0: %{name}-override-libtinfo.patch Patch1: %{name}-ppc64-VA-range-SUSE.patch Patch2: %{name}-PN_XNUM.patch +Patch3: %{name}-eppic-v5.0.patch BuildRequires: libbz2-devel BuildRequires: libdw-devel BuildRequires: libelf-devel +%if %{build_eppic} BuildRequires: libeppic-devel +%endif BuildRequires: lzo-devel BuildRequires: ncurses-devel BuildRequires: xz-devel @@ -88,16 +93,20 @@ export USEZSTD=on export USELZO=on export LINKTYPE=dynamic make %{?_smp_mflags} LDFLAGS="-Wl,-rpath,%{_libdir}/%{name}-%{version}" +%if %{build_eppic} make %{?_smp_mflags} eppic_makedumpfile.so %{?ncurses_make_opts} +%endif %install install -D -m 0755 makedumpfile %{buildroot}%{_bindir}/makedumpfile install -D -m 0755 makedumpfile-R.pl %{buildroot}%{_bindir}/makedumpfile-R.pl install -D -m 0644 makedumpfile.8 %{buildroot}%{_mandir}/man8/makedumpfile.8 install -D -m 0644 makedumpfile.conf.5 %{buildroot}%{_mandir}/man5/makedumpfile.conf.5 +%if %{build_eppic} install -D -m 0755 eppic_makedumpfile.so %{buildroot}%{_libdir}/%{name}-%{version}/eppic_makedumpfile.so install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/ eppic_scripts/* +%endif # Compatibility cruft # there is no %%license prior to SLE12 @@ -117,9 +126,11 @@ install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/ epp %doc README IMPLEMENTATION %{_mandir}/man?/* %{_bindir}/* +%if %{build_eppic} %dir %{_libdir}/%{name}-%{version} %{_libdir}/%{name}-%{version}/eppic_makedumpfile.so %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/eppic_scripts/ +%endif %changelog