From b327c7196b42fca13edaf8444ca70db0e820a16f Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 12 Jan 2023 15:59:01 +0000 Subject: [PATCH 1/2] Disable SELinux support on OS X --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index abe141bd0e..e1524f6d11 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,21 @@ DOCKER := $(shell { command -v podman || command -v docker; }) TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S") +detected_OS := $(shell uname) # Classify UNIX OS +ifeq ($(detected_OS),Darwin) #We only care if it's OS X +SELINUX1 := +SELINUX2 := +else +SELINUX1 := :z +SELINUX2 := ,z +endif .PHONY: all clean all: $(DOCKER) build --tag zmk --file Dockerfile . $(DOCKER) run --rm -it --name zmk \ - -v $(PWD)/firmware:/app/firmware:z \ - -v $(PWD)/config:/app/config:ro,z \ + -v $(PWD)/firmware:/app/firmware$(SELINUX1) \ + -v $(PWD)/config:/app/config:ro$(SELINUX2) \ -e TIMESTAMP=$(TIMESTAMP) \ zmk From 7389b0c455f80e690a0a07043f2673c75d78c438 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Fri, 13 Jan 2023 21:21:47 +0000 Subject: [PATCH 2/2] use $(strip to remove whitespace --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e1524f6d11..7e95cb8b5c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ DOCKER := $(shell { command -v podman || command -v docker; }) TIMESTAMP := $(shell date -u +"%Y%m%d%H%M%S") detected_OS := $(shell uname) # Classify UNIX OS -ifeq ($(detected_OS),Darwin) #We only care if it's OS X +ifeq ($(strip $(detected_OS)),Darwin) #We only care if it's OS X SELINUX1 := SELINUX2 := else