MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-23 13:24:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'push-combine' into 'master'

Browse Source 
Add push recipe combination and more ports to forward on QEMU

See merge request redox-os/redox!1647
This commit is contained in:
Jeremy Soller 2025-09-27 22:11:42 -06:00
commit 3ac5ff33c2
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mk/qemu.mk
View File

@ -200,9 +200,13 @@ else
ifneq ($(bridge),)
QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0
else ifeq ($(net),redir)
# port 8080 and 8083 - webservers
# port 8022 - ssh
# port 8080-8083 - webservers
# port 64126 - our gdbserver implementation
QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126$(EXTRANETARGS)
FWD_PORTS := 8081 8082 8083 64126
FWD_FLAGS := hostfwd=tcp::8022-:22,hostfwd=tcp::8080-:80
FWD_FLAGS2 := $(foreach p,$(FWD_PORTS),,hostfwd=tcp::$(p)-:$(p))
QEMUFLAGS += -netdev user,id=net0,$(FWD_FLAGS)$(subst $(eval ) ,,$(FWD_FLAGS2))$(EXTRANETARGS)
else ifeq ($(net),windows)
QEMUFLAGS+=-netdev user,id=net0$(EXTRANETARGS)
else

29
mk/repo.mk
View File

@ -166,6 +166,35 @@ else
$(MAKE) f.$*
endif
# Invoke repo.sh and push for one of more targets separated by comma
rp.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
$(MAKE) r.$*
$(MAKE) p.$*
endif
# Invoke clean.sh, repo.sh and push for one of more targets separated by comma
crp.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
$(MAKE) c.$*
$(MAKE) r.$*
$(MAKE) p.$*
endif
# Invoke unfetch.sh. clean.sh, repo.sh and push for one of more targets separated by comma
ucrp.%: $(FSTOOLS_TAG) FORCE
ifeq ($(PODMAN_BUILD),1)
$(PODMAN_RUN) make $@
else
$(MAKE) u.$*
$(MAKE) c.$*
$(MAKE) r.$*
$(MAKE) p.$*
endif
export DEBUG_BIN?=