container: use ./run rather than EMILE_CONTAINER=1 make

Signed-off-by: Laurent Vivier <laurent@vivier.eu>

Makefile

@@ -10,8 +10,8 @@ include tools.mk
 include kernel.mk
 include container.mk
 
-SYSTEM:=$(shell $(RUN) uname -s)
-MACHINE:=$(shell $(RUN) uname -m)
+SYSTEM:=$(shell uname -s)
+MACHINE:=$(shell uname -m)
 ifeq ($(SYSTEM), Linux)
 NATIVE:=$(MACHINE)-linux
 else

container.mk

@@ -5,7 +5,6 @@
 CONTAINER_ENGINE ?= podman
 ROOTFS_IMG ?= localhost/m68k-sid-rootfs:latest
 EMILE_IMAGE ?= emile-m68k
-EMILE_CONTAINER  ?= 0
 
 .PHONY: import-rootfs
 import-rootfs: .container/rootfs.tar.xz
@@ -19,9 +18,3 @@ import-rootfs: .container/rootfs.tar.xz
 .PHONY: emile-m68k-container
 emile-m68k-container: import-rootfs
 	$(CONTAINER_ENGINE) build -f .container/Containerfile.m68k -t $(EMILE_IMAGE) --build-arg UID=$$(id -u) --build-arg GID=$$(id -g)
-
-ifeq ($(EMILE_CONTAINER),1)
-.NOTPARALLEL:
-RUN := $(CONTAINER_ENGINE) run --rm --userns=keep-id -v $$(pwd):/src:Z -w /src -u $$(id -u):$$(id -g) -e EMILE_CONTAINER=0 $(EMILE_IMAGE)
-MAKE := $(RUN) make
-endif

run

@@ -0,0 +1 @@
+exec podman run --rm --userns=keep-id -v $(pwd):/src:Z -w /src -u $(id -u):$(id -g) emile-m68k "$@"