vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'rw_van_221116' into 'master'

Browse source 
fix podman colors, env target and netsurf build

See merge request redox-os/redox!1289
This commit is contained in:
Jeremy Soller 2022-11-15 09:49:40 +00:00
parent 82babc5c5b edbea01093
commit 43f84da98a
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -64,9 +64,13 @@ include mk/virtualbox.mk
# CI # CI
include mk/ci.mk 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" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
bash bash
endif
gdb: FORCE gdb: FORCE
gdb cookbook/recipes/kernel/build/kernel.sym --eval-command="target remote localhost:1234" gdb cookbook/recipes/kernel/build/kernel.sym --eval-command="target remote localhost:1234"

2
mk/podman.mk
View file

@ -12,7 +12,7 @@ CONTAINER_WORKDIR?=/mnt/redox
PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z 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_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_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) PODMAN_RUN?=podman run $(PODMAN_OPTIONS) $(PODMAN_VOLUMES) $(PODMAN_ENV) $(PODMAN_CONFIG) $(IMAGE_TAG)
container_shell: build/container.tag container_shell: build/container.tag

1
podman/redox-base-containerfile
View file

@ -33,6 +33,7 @@ RUN apt-get update \
ninja-build \ ninja-build \
meson \ meson \
python3-mako \ python3-mako \
xxd \
rsync \ rsync \
wget wget