OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity
acrn-hypervisor/misc/debug_tools/acrn_log/Makefile

57 lines
1.5 KiB
Makefile
Raw Permalink Normal View History

use variables for installation directories. Don't hardcode install paths. Instead of hardcoding where binaries are installed, add variables that installer can override. Tracked-On: #4864 Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2019-12-26 16:24:20 +08:00
include ../../../paths.make
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
T := $(CURDIR)
OUT_DIR ?= $(shell mkdir -p $(T)/build;cd $(T)/build;pwd)
CC ?= gcc
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_CFLAGS := -g -O0 -std=gnu11
LOG_CFLAGS += -D_GNU_SOURCE
LOG_CFLAGS += -DNO_OPENSSL
LOG_CFLAGS += -m64
LOG_CFLAGS += -Wall -ffunction-sections
LOG_CFLAGS += -Werror
Makefile: undefine _FORTIFY_SOURCE prior using it Currently, we are enforcing the _FORTIFY_SOURCE=2 without any previous detection if the macro has been already defined, e.g. by environment, or is just enabled by compiler by default on some distributions (e.g. Gentoo). This could result in the error like this: <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] <built-in>: note: this is the location of the previous definition Tracked-On: #2344 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-10-23 15:02:24 +08:00
LOG_CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_CFLAGS += -Wformat -Wformat-security -fno-strict-aliasing
LOG_CFLAGS += -fpie -fpic
LOG_CFLAGS += $(CFLAGS)
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
GCC_MAJOR=$(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
GCC_MINOR=$(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)
#enable stack overflow check
STACK_PROTECTOR := 1
ifdef STACK_PROTECTOR
ifeq (true, $(shell [ $(GCC_MAJOR) -gt 4 ] && echo true))
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_CFLAGS += -fstack-protector-strong
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
else
ifeq (true, $(shell [ $(GCC_MAJOR) -eq 4 ] && [ $(GCC_MINOR) -ge 9 ] && echo true))
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_CFLAGS += -fstack-protector-strong
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
else
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_CFLAGS += -fstack-protector
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
endif
endif
endif
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
LOG_LDFLAGS := -Wl,-z,noexecstack
LOG_LDFLAGS += -Wl,-z,relro,-z,now
LOG_LDFLAGS += -pie
LOG_LDFLAGS += $(LDFLAGS)
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
DM:tools: add acrnlog tool acrnlog is an SOS userland tool to capture ACRN hypervisor log to /tmp/acrnog/. Two kinds of logs would be saved: - log of current running; - log of last running if crashed and logs remaining. [Usage] acrnlog [-s] [size] [-n] [number] [Options] -h: print this message -s: size limitation for each log file, in MB. 0 means no limitation. -n: how many files you would like to keep on disk Signed-off-by: Yan, Like <like.yan@intel.com> Reviewed-by: Zhao Yakui <yakui.zhao@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2018-03-29 16:10:00 +08:00
all:
tools: respect CFLAGS and LDFLAGS from environment The build environment might want to pass extra CFLAGS or LDFLAGS to the build of the acrn tools. With conventional build systems like automake, Meson, etc this is possible by just setting CFLAGS and LDFLAGS in the environment. However as the tools are built using bare Makefiles, these environment variables are overwritten. Respect them by renaming the variables in the Makefiles to e.g. LOG_CFLAGS and adding CFLAGS to that. Tracked-On: #2316 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-11 19:27:50 +08:00
$(CC) -g acrnlog.c -o $(OUT_DIR)/acrnlog -lpthread $(LOG_CFLAGS) $(LOG_LDFLAGS)
Tools:acrnlog: install acrnlog.service Acked-by: Eddie Dong <eddie.dong@intel.com> Signed-off-by: Yan, Like <like.yan@intel.com>
2018-06-01 15:04:56 +08:00
cp acrnlog.service $(OUT_DIR)/acrnlog.service
DM:tools: add acrnlog tool acrnlog is an SOS userland tool to capture ACRN hypervisor log to /tmp/acrnog/. Two kinds of logs would be saved: - log of current running; - log of last running if crashed and logs remaining. [Usage] acrnlog [-s] [size] [-n] [number] [Options] -h: print this message -s: size limitation for each log file, in MB. 0 means no limitation. -n: how many files you would like to keep on disk Signed-off-by: Yan, Like <like.yan@intel.com> Reviewed-by: Zhao Yakui <yakui.zhao@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2018-03-29 16:10:00 +08:00
clean:
Tools: add Makefile for all tools Add a Makefile under ./tools to avoid changing top-level Makefile frequently Acked-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Signed-off-by: Yan, Like <like.yan@intel.com>
2018-06-04 15:57:25 +08:00
rm -f $(OUT_DIR)/acrnlog
tools: correct several Makefile problems 1. mkdir ./tools/build if it does not exist; 2. correct static lib path for acrn-manager; 3. do not remove acrnlog.service if build under source code dir by default. Reviewed-by: Geoffroy VanCutsem <geoffroy.vancutsem@intel.com> Signed-off-by: Yan, Like <like.yan@intel.com>
2018-06-13 15:54:22 +08:00
ifneq ($(OUT_DIR),.)
Tools: add Makefile for all tools Add a Makefile under ./tools to avoid changing top-level Makefile frequently Acked-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Signed-off-by: Yan, Like <like.yan@intel.com>
2018-06-04 15:57:25 +08:00
rm -f $(OUT_DIR)/acrnlog.service
tools: acrnlog: update Makefile In order to sync the compiler options with devicemode and enable options to harden software. Tracked-On: #1122 Signed-off-by: Yan, Like <like.yan@intel.com> Acked-by: Yin Fengwei <fengwei.yin@intel.com>
2018-09-20 09:37:11 +08:00
rm -rf $(OUT_DIR)
tools: correct several Makefile problems 1. mkdir ./tools/build if it does not exist; 2. correct static lib path for acrn-manager; 3. do not remove acrnlog.service if build under source code dir by default. Reviewed-by: Geoffroy VanCutsem <geoffroy.vancutsem@intel.com> Signed-off-by: Yan, Like <like.yan@intel.com>
2018-06-13 15:54:22 +08:00
endif
Makefile: implement make install The make install target was missing. This commits adds the intall target which uses the install target from subprojects. Also a make install target was created in each tool program. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 03:21:45 +08:00
install: $(OUT_DIR)/acrnlog
use variables for installation directories. Don't hardcode install paths. Instead of hardcoding where binaries are installed, add variables that installer can override. Tracked-On: #4864 Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
2019-12-26 16:24:20 +08:00
install -d $(DESTDIR)$(bindir)
install -t $(DESTDIR)$(bindir) $(OUT_DIR)/acrnlog
install -d $(DESTDIR)$(systemd_unitdir)/system
install -p -D -m 0644 $(OUT_DIR)/acrnlog.service $(DESTDIR)$(systemd_unitdir)/system