From 21bd0a00787295cf3eb0c2bc7ef5b5eb8bfc5c65 Mon Sep 17 00:00:00 2001 From: linxin Date: Mon, 22 May 2023 19:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=84=9A=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/tools/linux/coredump_handler_wrapper/Makefile | 4 ++-- ci/travis.sh | 2 +- script/coredump.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/Makefile b/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/Makefile index e5ea315..c0f4da8 100644 --- a/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/Makefile +++ b/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/Makefile @@ -1,7 +1,7 @@ CC=g++ -CFLAGS=-I/builds/linxin/coredump-tools/breakpad/src -std=c++11 -fPIC +CFLAGS=-I/builds/linxin/coredump-tools/breakpad-coredump-tools/src -std=c++11 -fPIC LDFLAGS=-shared -fPIC -SRC=/builds/linxin/coredump-tools/breakpad/src/tools/linux/core_handler/coredump_handler_wrapper/coredump_handler_wrapper.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/minidump_writer.cc /builds/linxin/coredump-tools/breakpad/src/common/path_helper.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/linux_libc_support.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/elf_core_dump.cc /builds/linxin/coredump-tools/breakpad/src/client/minidump_file_writer.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/linux_dumper.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/memory_mapped_file.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/safe_readlink.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc /builds/linxin/coredump-tools/breakpad/src/common/string_conversion.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/dump_writer_common/thread_info.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/file_id.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/minidump_writer.cc /builds/linxin/coredump-tools/breakpad/src/client/linux/minidump_writer/pe_file.cc /builds/linxin/coredump-tools/breakpad/src/common/convert_UTF.cc /builds/linxin/coredump-tools/breakpad/src/common/linux/elfutils.cc +SRC=/builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/core_handler/coredump_handler_wrapper/coredump_handler_wrapper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_core_dumper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/minidump_writer.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/path_helper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/linux_libc_support.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/elf_core_dump.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/minidump_file_writer.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_dumper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/memory_mapped_file.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/safe_readlink.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_ptrace_dumper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/dump_writer_common/ucontext_reader.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/string_conversion.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/dump_writer_common/thread_info.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/file_id.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/linux_core_dumper.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/minidump_writer.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/client/linux/minidump_writer/pe_file.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/convert_UTF.cc /builds/linxin/coredump-tools/breakpad-coredump-tools/src/common/linux/elfutils.cc OBJ=$(SRC:.cc=.o) diff --git a/ci/travis.sh b/ci/travis.sh index 1de775d..2e81325 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -43,7 +43,7 @@ go env pwd ls mkdir -p /builds/linxin/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} -cd /builds/linxin/coredump-tools/breakpad/src/tools/linux/coredump_handler_wrapper +cd /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper make mkdir /opt/tsg/coredump/bin cp coredump_handler_wrapper.so /opt/tsg/coredump/bin diff --git a/script/coredump.spec b/script/coredump.spec index 39f9dfe..00fbe52 100644 --- a/script/coredump.spec +++ b/script/coredump.spec @@ -31,7 +31,7 @@ mkdir -p %{buildroot}/opt/tsg/coredump/etc mkdir -p %{buildroot}/etc/profile.d mkdir -p %{buildroot}/usr/lib/tmpfiles.d mkdir -p %{buildroot}/usr/lib/sysctl.d -cp /builds/linxin/coredump-tools/breakpad/src/tools/linux/coredump_handler_wrapper/coredump_handler_wrapper.so %{buildroot}/opt/tsg/coredump/bin +cp /builds/linxin/coredump-tools/breakpad-coredump-tools/src/tools/linux/coredump_handler_wrapper/coredump_handler_wrapper.so %{buildroot}/opt/tsg/coredump/bin cp ./coredump-handler/coredump-handler %{buildroot}/opt/tsg/coredump/bin cp ./config/config.json %{buildroot}/opt/tsg/coredump/etc cp ./coredump-tool/coredump-tool %{buildroot}/opt/tsg/coredump/bin