Skip to content

Commit b115546

Browse files
miguelinuxwenlingz
authored andcommitted
crashlog: deprecate acrnprobe_prepare and update Makefile
The `crashlogctl` command is replacing acrnprobe_prepare script. So, let's remove from the project, and update the Makefile with the new content. Tracked-On: #1386 Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com> Reviewed-by: Zhi Jin <zhi.jin@intel.com> Acked-by: Chen Gang <gang.c.chen@intel.com>
1 parent f3fc857 commit b115546

File tree

4 files changed

+15
-75
lines changed

4 files changed

+15
-75
lines changed

tools/acrn-crashlog/Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,27 @@ install:
102102
@install -p -D -m 0755 $(BUILDDIR)/usercrash/bin/debugger $(DESTDIR)/usr/bin/
103103
@install -p -D -m 0755 $(BUILDDIR)/usercrash/bin/usercrash_c $(DESTDIR)/usr/bin/
104104
@install -p -D -m 0755 $(BUILDDIR)/usercrash/bin/usercrash_s $(DESTDIR)/usr/bin/
105-
@install -p -D -m 0755 data/acrnprobe_prepare.sh $(DESTDIR)/usr/bin/
105+
@install -p -D -m 0755 data/crashlogctl $(DESTDIR)/usr/bin/
106106
@install -p -D -m 0755 data/usercrash-wrapper $(DESTDIR)/usr/bin/
107107
@install -d $(DESTDIR)/usr/share/acrn/crashlog
108108
@install -p -D -m 0644 data/40-watchdog.conf $(DESTDIR)/usr/share/acrn/crashlog
109+
@install -p -D -m 0644 data/80-coredump.conf $(DESTDIR)/usr/share/acrn/crashlog
109110
@install -d $(DESTDIR)/usr/share/defaults/telemetrics/
110111
@install -p -D -m 0644 data/acrnprobe.xml $(DESTDIR)/usr/share/defaults/telemetrics/
111112
@install -d $(DESTDIR)/usr/lib/systemd/system/
112113
@install -p -D -m 0644 data/acrnprobe.service $(DESTDIR)/usr/lib/systemd/system/
113-
@install -p -D -m 0644 data/prepare.service $(DESTDIR)/usr/lib/systemd/system/
114114
@install -p -D -m 0644 data/usercrash.service $(DESTDIR)/usr/lib/systemd/system/
115+
@install -d $(DESTDIR)/usr/lib/tmpfiles.d
116+
@install -p -D -m 0644 data/acrn-crashlog-dirs.conf $(DESTDIR)/usr/lib/tmpfiles.d/
115117

116118
.PHONY:uninstall
117119
uninstall:
118120
@if [ -e "$(DESTDIR)/usr/bin/acrnprobe" ];then \
119121
$(RM) $(DESTDIR)/usr/bin/acrnprobe; \
120122
fi
121-
@if [ -e "$(DESTDIR)/usr/bin/acrnprobe_prepare.sh" ];then \
122-
$(RM) $(DESTDIR)/usr/bin/acrnprobe_prepare.sh; \
123+
@if [ -e "$(DESTDIR)/usr/bin/crashlogctl" ];then \
124+
$(DESTDIR)/usr/bin/crashlogctl disable && \
125+
$(RM) $(DESTDIR)/usr/bin/crashlogctl; \
123126
fi
124127
@if [ -e "$(DESTDIR)/usr/bin/debugger" ];then \
125128
$(RM) $(DESTDIR)/usr/bin/debugger; \
@@ -136,15 +139,18 @@ uninstall:
136139
@if [ -e "$(DESTDIR)/usr/share/acrn/crashlog/40-watchdog.conf" ];then \
137140
$(RM) $(DESTDIR)/usr/share/acrn/crashlog/40-watchdog.conf; \
138141
fi
142+
@if [ -e "$(DESTDIR)/usr/share/acrn/crashlog/80-coredump.conf" ];then \
143+
$(RM) $(DESTDIR)/usr/share/acrn/crashlog/80-coredump.conf; \
144+
fi
139145
@if [ -e "$(DESTDIR)/usr/share/defaults/telemetrics/acrnprobe.xml" ];then \
140146
$(RM) $(DESTDIR)/usr/share/defaults/telemetrics/acrnprobe.xml; \
141147
fi
142148
@if [ -e "$(DESTDIR)/usr/lib/systemd/system/acrnprobe.service" ];then \
143149
$(RM) $(DESTDIR)/usr/lib/systemd/system/acrnprobe.service; \
144150
fi
145-
@if [ -e "$(DESTDIR)/usr/lib/systemd/system/prepare.service" ];then \
146-
$(RM) $(DESTDIR)/usr/lib/systemd/system/prepare.service; \
147-
fi
148151
@if [ -e "$(DESTDIR)/usr/lib/systemd/system/usercrash.service" ];then \
149152
$(RM) $(DESTDIR)/usr/lib/systemd/system/usercrash.service; \
150153
fi
154+
@if [ -e "$(DESTDIR)/usr/lib/tmpfiles.d/acrn-crashlog-dirs.conf" ];then \
155+
$(RM) $(DESTDIR)/usr/lib/tmpfiles.d/acrn-crashlog-dirs.conf; \
156+
fi

tools/acrn-crashlog/data/acrnprobe_prepare.sh

Lines changed: 0 additions & 56 deletions
This file was deleted.

tools/acrn-crashlog/data/crashlogctl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Copyright (C) <2018> Intel Corporation
44
# SPDX-License-Identifier: BSD-3-Clause
55
#
6+
# crashlogctl is part of acrn-hypervisor.
7+
#
68

79
declare -a CRASHLOG_SERVICES=(
810
acrnprobe.service

tools/acrn-crashlog/data/prepare.service

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)