From 1eb58df1ac797db9545fb2cb3b3047cc794109f9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 27 Dec 2018 08:36:00 +0000 Subject: can run dockerbuild on Fedora 28 with selinux in enforcing mode --- Makefile | 5 ++++- systemtap/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 02ce80a..fb75703 100644 --- a/Makefile +++ b/Makefile @@ -22,9 +22,12 @@ doxygen: test: $(MAKE) -C ioriot test dockerbuild: + bash -c 'test ! -d $(PWD)/docker/opt/ && mkdir -p $(PWD)/docker/opt/; exit 0' + bash -c 'test -f /etc/fedora-release && sudo chcon -Rt svirt_sandbox_file_t $(PWD)/docker/opt; exit 0' + bash -c 'test -f /etc/centos-release && sudo chcon -Rt svirt_sandbox_file_t $(PWD)/docker/opt; exit 0' + bash -c 'test -f /etc/redhat-release && sudo chcon -Rt svirt_sandbox_file_t $(PWD)/docker/opt; exit 0' sed s/KERNEL/$(KERNEL)/ Dockerfile.in > Dockerfile docker build . -t ioriot:$(KERNEL) - bash -c 'test ! -d $(PWD)/docker/opt/ && mkdir -p $(PWD)/docker/opt/; exit 0' docker run -v $(PWD)/docker/opt:/opt -e 'KERNEL=$(KERNEL)' -it ioriot:$(KERNEL) make all test install dockerclean: bash -c 'test -d $(PWD)/docker && rm -Rfv $(PWD)/docker; exit 0' diff --git a/systemtap/Makefile b/systemtap/Makefile index 49f1977..97e24d6 100644 --- a/systemtap/Makefile +++ b/systemtap/Makefile @@ -8,7 +8,7 @@ prepare: sed 's/execname() != "stapio"/pid() == target()/' ./src/ioriot.stp > ./src/targetedioriot.stp sed 's/execname() != "stapio"/execname() == "java"/' ./src/ioriot.stp > ./src/javaioriot.stp compile: - @echo Crosscompiling for Kernel version $(KERNEL) + @echo Compiling for Kernel version $(KERNEL) for stp in ioriot javaioriot targetedioriot; do \ stap -v ./src/$$stp.stp -p 4 -r $(KERNEL) -m $$stp \ -D MAXSTRINGLEN=255 -D MAXACTION=10000 -D MAXSKIPPED=10000\ -- cgit v1.2.3