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

Add the mold linker in the Podman container

See merge request redox-os/redox!1589

config/aarch64/desktop.toml

@@ -12,3 +12,4 @@ include = ["../desktop.toml"]
 # Package settings
 [packages]
 # example = {}
+rustpython = "ignore" # not tested

config/desktop.toml

@@ -21,7 +21,7 @@ orbdata = {}
 orbital = {}
 orbutils = {}
 pop-icon-theme = {}
-rustpython = {}
+#rustpython = {} # not compiling with our rust version
 shared-mime-info = {}
 patchelf = {}
 

config/dev.toml

@@ -77,7 +77,7 @@ data = """
 #include <stdio.h>
 
 int main(void) {
-	printf("Hello, Redox!\\n");
+	printf("Hello, Redox!\n");
 }
 """
 

config/x86_64/ci.toml

@@ -170,7 +170,7 @@ rs-nes = {}
 rust64 = {}
 #rust-cairo = {} # linking errors
 #rust-cairo-demo = {} # linking errors
-rustpython = {}
+#rustpython = {} # undefined constants S_IWRITE and S_IEXEC (upstream should be fixed)
 rustual-boy = {}
 #schismtracker = {} # uses system includes
 scummvm = {}

cookbook

@@ -1 +1 @@
-Subproject commit 8fa5b0b2729a6ba045e9f478162cb444ffd1d012
+Subproject commit b87024711a1d4b9c0e8388f7ad2d869c679a91d9

mk/config.mk

@@ -16,9 +16,8 @@ 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?=0
-## Do not update source repos, attempt to build in offline condition
-REPO_OFFLINE?=0
+## REPO_NONSTOP?=--nonstop
+REPO_NONSTOP?=
 ## Select filesystem config
 ifeq ($(BOARD),)
 FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
@@ -57,17 +56,6 @@ 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

mk/prefix.mk

@@ -114,7 +114,6 @@ $(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" && \

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 $(REPO_NONSTOP) $(REPO_OFFLINE) "$${PACKAGES}"
+	./fetch.sh "$${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) $(REPO_OFFLINE) "$${PACKAGES}"
+	./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
 	mkdir -p $(BUILD)
 	# make sure fstools.tag and fetch.tag are newer than the things repo modifies
 	touch $(FSTOOLS_TAG)