Merge branch 'add-mold-package' into 'master'

Add the mold linker in the Podman container See merge request redox-os/redox!1589
Merge branch 'enable-rustpython' into 'master'
2026-07-01 09:08:42 +08:00 · 2025-07-11 00:01:18 -03:00 · 2025-07-10 14:16:03 -06:00 · 2025-07-10 14:15:52 -06:00 · 2025-07-10 02:49:58 +00:00 · 2025-07-10 09:30:32 +07:00
9 changed files with 22 additions and 9 deletions
--- a/config/aarch64/desktop.toml
+++ b/config/aarch64/desktop.toml
@ -12,4 +12,3 @@ include = ["../desktop.toml"]
 # Package settings
 [packages]
 # example = {}
-rustpython = "ignore" # not tested
--- a/config/desktop.toml
+++ b/config/desktop.toml
@ -21,7 +21,7 @@ orbdata = {}
 orbital = {}
 orbutils = {}
 pop-icon-theme = {}
-#rustpython = {} # not compiling with our rust version
+rustpython = {}
 shared-mime-info = {}
 patchelf = {}

--- a/config/dev.toml
+++ b/config/dev.toml
@ -77,7 +77,7 @@ data = """
 #include <stdio.h>

 int main(void) {
-	printf("Hello, Redox!\n");
+	printf("Hello, Redox!\\n");
 }
 """

--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@ -170,7 +170,7 @@ rs-nes = {}
 rust64 = {}
 #rust-cairo = {} # linking errors
 #rust-cairo-demo = {} # linking errors
-#rustpython = {} # undefined constants S_IWRITE and S_IEXEC (upstream should be fixed)
+rustpython = {}
 rustual-boy = {}
 #schismtracker = {} # uses system includes
 scummvm = {}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b87024711a1d4b9c0e8388f7ad2d869c679a91d9
+Subproject commit 8fa5b0b2729a6ba045e9f478162cb444ffd1d012
--- a/mk/config.mk
+++ b/mk/config.mk
@ -16,8 +16,9 @@ REPO_BINARY?=0
 ## Name of the configuration to include in the image name e.g. desktop or server
 CONFIG_NAME?=desktop
 ## Ignore errors when building the repo, attempt to build every package
-## REPO_NONSTOP?=--nonstop
-REPO_NONSTOP?=
+REPO_NONSTOP?=0
+## Do not update source repos, attempt to build in offline condition
+REPO_OFFLINE?=0
 ## Select filesystem config
 ifeq ($(BOARD),)
 FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
@ -56,6 +57,17 @@ ifeq (,$(shell command -v sccache))
 endif
 endif

+ifeq ($(REPO_NONSTOP),1)
+	REPO_NONSTOP=--nonstop
+else ifeq ($(REPO_NONSTOP),0)
+	REPO_NONSTOP=
+endif
+ifeq ($(REPO_OFFLINE),1)
+	REPO_OFFLINE=--offline
+else ifeq ($(REPO_OFFLINE),0)
+	REPO_OFFLINE=
+endif
+
 UNAME := $(shell uname)
 ifeq ($(UNAME),Darwin)
 	FUMOUNT=umount
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@ -114,6 +114,7 @@ $(PREFIX)/sysroot: $(PREFIX)/relibc-install $(PREFIX)/libtool-build $(CONTAINER_
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
+	rm -rf "$@"
 	cp -r "$(PREFIX)/relibc-install/" "$@"
 	PATH="$(ROOT)/$(PREFIX)/rust-install/bin:$$PATH" && \
 	cd "$(PREFIX)/libtool-build" && \
--- a/mk/repo.mk
+++ b/mk/repo.mk
@ -8,7 +8,7 @@ else
 	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
 	cd cookbook && \
-	./fetch.sh "$${PACKAGES}"
+	./fetch.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
 	mkdir -p $(BUILD)
 	touch $@
 endif
@ -21,7 +21,7 @@ else
 	export COOKBOOK_HOST_SYSROOT="$(ROOT)/$(PREFIX_INSTALL)" && \
 	PACKAGES="$$($(LIST_PACKAGES) $(LIST_PACKAGES_OPTS) -c $(FILESYSTEM_CONFIG))" && \
 	cd cookbook && \
-	./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
+	./repo.sh $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
 	mkdir -p $(BUILD)
 	# make sure fstools.tag and fetch.tag are newer than the things repo modifies
 	touch $(FSTOOLS_TAG)
--- a/podman/redox-base-containerfile
+++ b/podman/redox-base-containerfile
@ -56,6 +56,7 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
 		m4 \
 		make \
 		meson \
+		mold \
 		nasm \
 		ninja-build \
 		patch \
Author	SHA1	Message	Date
Ribbon	3b76ebaa9f	Merge branch 'add-mold-package' into 'master' Add the mold linker in the Podman container See merge request redox-os/redox!1589	2025-07-11 00:01:18 -03:00
Jeremy Soller	e587acf4df	Merge branch 'enable-rustpython' into 'master' Enable rustpython See merge request redox-os/redox!1611	2025-07-10 14:16:03 -06:00
Jeremy Soller	3cab7ea045	Merge branch 'fix-dev' into 'master' Fix dev C example See merge request redox-os/redox!1610	2025-07-10 14:15:52 -06:00
Wildan Mubarok	a9eb7d2f16	Enable rustpython	2025-07-10 02:49:58 +00:00
Wildan M	9e2de0f7e2	Fix dev C example	2025-07-10 09:30:32 +07:00
Jeremy Soller	722ebf6f30	Merge branch 'repo-offline' into 'master' Add REPO_OFFLINE option Closes #1202 See merge request redox-os/redox!1607	2025-07-09 09:47:50 -06:00
Jeremy Soller	2188396298	Merge branch 'cookbook-sha' into 'master' Update cookbook See merge request redox-os/redox!1609	2025-07-09 09:47:21 -06:00
Ron Williams	059f8f0bf2	Update cookbook	2025-07-09 11:08:15 +00:00
Jeremy Soller	110e49d080	Merge branch 'fix-sysroot-update' into 'master' Fix sysroot update logic See merge request redox-os/redox!1608	2025-07-08 06:02:28 -06:00
Wildan Mubarok	174fcaa6b9	Fix sysroot update logic	2025-07-08 10:21:16 +00:00
Jeremy Soller	33283b91d8	Update cookbook	2025-07-07 16:10:32 -06:00
Wildan Mubarok	0c1ea19680	Merge branch redox:master into repo-offline	2025-07-07 07:40:27 +00:00
Wildan Mubarok	cb619120a4	Make repo config configurable with integer	2025-07-05 16:21:58 +00:00
Wildan Mubarok	47805f2362	Add REPO_OFFLINE option	2025-07-05 15:53:39 +00:00
Ribbon	2607824648	Add the mold linker in the Podman container	2025-06-20 00:00:11 -03:00