Upgrade to version 1.6.4
This commit is contained in:
chen-jan
parent
5f68644248
commit
dad4b7ccd6
24
0001-add-stdbool.h-to-fix-build-error.patch
Normal file
24
0001-add-stdbool.h-to-fix-build-error.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From af9a2029b58ed47da03a884d3e1644f858e88921 Mon Sep 17 00:00:00 2001
|
||||
From: chen-jan <chen_aka_jan@163.com>
|
||||
Date: Wed, 21 Jun 2023 10:25:35 +0800
|
||||
Subject: [PATCH] add stdbool.h to fix build error
|
||||
|
||||
---
|
||||
src/libgcore/gcore_coredump.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/libgcore/gcore_coredump.c b/src/libgcore/gcore_coredump.c
|
||||
index 8eece96..b2e9bb3 100644
|
||||
--- a/src/libgcore/gcore_coredump.c
|
||||
+++ b/src/libgcore/gcore_coredump.c
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <defs.h>
|
||||
#include <gcore_defs.h>
|
||||
+#include <stdbool.h>
|
||||
|
||||
static struct elf_note_info *elf_note_info_init(void);
|
||||
|
||||
--
|
||||
2.39.1
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
From 33f3c97f7d45c8bb1b43a8d551cb01a9873bb123 Mon Sep 17 00:00:00 2001
|
||||
From: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
Date: Tue, 28 Feb 2023 03:59:16 -0500
|
||||
Subject: [PATCH] coredump: fix building failure due to undefined macros
|
||||
MAPLE_TREE_{COUNT,GATHER}
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
As of the commit 13794ace3830bf0274fe7b2e0e579ad72e31848f (coredump:
|
||||
fix failure of executing gcore command due to introduction of maple
|
||||
tree management on vma list), gcore.so fails to get built with the
|
||||
following error messages with defs.h without maple tree API support:
|
||||
|
||||
libgcore/gcore_coredump.c:189:50: error: ‘MAPLE_TREE_COUNT’ undeclared (first use in this function); did you mean ‘RADIX_TREE_COUNT’?
|
||||
189 | entry_num = do_maple_tree(mm_mt, MAPLE_TREE_COUNT, NULL);
|
||||
| ^~~~~~~~~~~~~~~~
|
||||
| RADIX_TREE_COUNT
|
||||
libgcore/gcore_coredump.c:189:50: note: each undeclared identifier is reported only once for each function it appears in
|
||||
libgcore/gcore_coredump.c:191:38: error: ‘MAPLE_TREE_GATHER’ undeclared (first use in this function); did you mean ‘RADIX_TREE_GATHER’?
|
||||
191 | do_maple_tree(mm_mt, MAPLE_TREE_GATHER, entry_list);
|
||||
| ^~~~~~~~~~~~~~~~~
|
||||
| RADIX_TREE_GATHER
|
||||
|
||||
This is caused by the missing macros MAPLE_TREE_COUNT and
|
||||
MAPLE_TREE_GATHER.
|
||||
|
||||
To fix the issue, define the two macros within crash gcore so that
|
||||
build is successfully done expecting the resulting binary works well
|
||||
when it is ran against new crash utility that has maple tree API
|
||||
support.
|
||||
|
||||
Signed-off-by: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
|
||||
---
|
||||
src/libgcore/gcore_coredump.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/libgcore/gcore_coredump.c b/src/libgcore/gcore_coredump.c
|
||||
index fa744d4..8eece96 100644
|
||||
--- a/src/libgcore/gcore_coredump.c
|
||||
+++ b/src/libgcore/gcore_coredump.c
|
||||
@@ -128,6 +128,14 @@ void gcore_readmem_user(ulong addr, void *buf, long size, char *type)
|
||||
}
|
||||
}
|
||||
|
||||
+#if !defined(MAPLE_TREE_COUNT)
|
||||
+#define MAPLE_TREE_COUNT (1)
|
||||
+#endif
|
||||
+
|
||||
+#if !defined(MAPLE_TREE_GATHER)
|
||||
+#define MAPLE_TREE_GATHER (4)
|
||||
+#endif
|
||||
+
|
||||
ulong __attribute__((weak))
|
||||
do_maple_tree(ulong root, int flag, struct list_pair *lp)
|
||||
{
|
||||
--
|
||||
2.39.2
|
||||
|
||||
Binary file not shown.
BIN
crash-gcore-command-1.6.4.tar.gz
Normal file
BIN
crash-gcore-command-1.6.4.tar.gz
Normal file
Binary file not shown.
@ -1,17 +1,20 @@
|
||||
%global reponame crash-gcore
|
||||
Name: crash-gcore-command
|
||||
Version: 1.6.3
|
||||
Version: 1.6.4
|
||||
Release: 1
|
||||
Summary: Command of Gcore for Crash utility
|
||||
|
||||
License: GPLv2
|
||||
URL: http://people.redhat.com/anderson/extensions/%{name}-%{version}.tar.gz
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
URL: https://github.com/fujitsu/crash-gcore
|
||||
Source: https://github.com/fujitsu/crash-gcore/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Buildroot: %{_tmppath}/%{name}-root
|
||||
BuildRequires: zlib-devel lzo-devel snappy-devel crash-devel >= 5.1.5 gcc
|
||||
BuildRequires: zlib-devel lzo-devel snappy-devel crash-devel >= 5.1.5 gcc make
|
||||
Requires: crash >= 5.1.5
|
||||
|
||||
Patch0: crash-gcore-1.6.4-coredump-fix-building-failure-due-to-undefined-macro.patch
|
||||
Patch1: 0001-add-stdbool.h-to-fix-build-error.patch
|
||||
|
||||
%description
|
||||
The crash-gcore-command packages contain an extension module for the crash utility
|
||||
that adds a "gcore" command which can create a core dump file of a user-space task
|
||||
@ -32,6 +35,9 @@ install -D %{_builddir}/%{reponame}-%{version}/src/gcore.so %{buildroot}%{_libdi
|
||||
%{_libdir}/crash/extensions/gcore.so
|
||||
|
||||
%changelog
|
||||
* Wed Jun 21 2023 chenchen <chen_aka_jan@163.com> - 1.6.4-1
|
||||
- Upgrade to version 1.6.4
|
||||
|
||||
* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.6.3-1
|
||||
- Upgrade to version 1.6.3
|
||||
|
||||
@ -40,6 +46,3 @@ install -D %{_builddir}/%{reponame}-%{version}/src/gcore.so %{buildroot}%{_libdi
|
||||
|
||||
* Thu Nov 28 2019 daiqianwen <daiqianwen@huawei.com> - 1.3.1-1
|
||||
- Package init
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user