From edbea01093521b16c6653795e88b89c6f56084b9 Mon Sep 17 00:00:00 2001
From: Ron Williams <ron.williams@englishbluffcg.com>
Date: Mon, 14 Nov 2022 22:13:46 -0800
Subject: [PATCH] fix podman colors, env target and netsurf build

---
 Makefile                        | 6 +++++-
 mk/podman.mk                    | 2 +-
 podman/redox-base-containerfile | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 10212e3..8fb583c 100644
--- a/Makefile
+++ b/Makefile
@@ -64,9 +64,13 @@ include mk/virtualbox.mk
 # CI
 include mk/ci.mk
 
-env: prefix FORCE
+env: prefix FORCE $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	bash
+endif
 
 gdb: FORCE
 	gdb cookbook/recipes/kernel/build/kernel.sym --eval-command="target remote localhost:1234"
diff --git a/mk/podman.mk b/mk/podman.mk
index 1398821..a36e8c0 100644
--- a/mk/podman.mk
+++ b/mk/podman.mk
@@ -12,7 +12,7 @@ CONTAINER_WORKDIR?=/mnt/redox
 PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z
 PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0
 PODMAN_CONFIG?=--env ARCH=$(ARCH) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG)
-PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --userns keep-id --user `id -u` --interactive
+PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --userns keep-id --user `id -u` --interactive --tty --env TERM=$(TERM)
 PODMAN_RUN?=podman run $(PODMAN_OPTIONS) $(PODMAN_VOLUMES) $(PODMAN_ENV) $(PODMAN_CONFIG) $(IMAGE_TAG)
 
 container_shell: build/container.tag
diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile
index 28fb28d..7698dc1 100644
--- a/podman/redox-base-containerfile
+++ b/podman/redox-base-containerfile
@@ -33,6 +33,7 @@ RUN apt-get update \
         ninja-build \
         meson \
         python3-mako \
+        xxd \
         rsync \
         wget