Merge branch 'new-platforms' into 'master'

WIP: Add support for building on new platforms

See merge request redox-os/redox!1263

CONTRIBUTING.md

@@ -20,7 +20,76 @@ Please review the `LICENSE` file for the project you are contributing to.
 
 ## Chat
 
-Join us on [Matrix Chat](https://doc.redox-os.org/book/chat.html) to discuss issues or ask questions.
+You can join in our chat platforms to discuss development, issues or ask questions.
+
+### [Matrix](https://matrix.to/#/#redox-join:matrix.org)
+
+Matrix is the official way to talk with Redox OS team and community (these rooms are English-only, we don't accept other languages because we don't understand them).
+
+Matrix has several different clients. [Element](https://element.io/) is a commonly used choice, it works on web browsers, Linux, MacOSX, Windows, Android and iOS.
+
+If you have problems with Element, try [Fractal](https://gitlab.gnome.org/World/fractal).
+
+- Join the [Join Requests](https://matrix.to/#/#redox-join:matrix.org) room and send a message requesting for an invite to the Redox Matrix space (the purpose of this is to avoid spam and bots).
+- #redox-join:matrix.org (Use this Matrix room address if you don't want to use the external Matrix link)
+
+(We recommend that you leave the "Join Requests" room after your entry on Redox space)
+
+If you want to have a big discussion in our rooms, you should use a Element thread, it's more organized and easy to keep track if more discussions happen on the same room.
+
+You cand find more information on the [Chat](https://doc.redox-os.org/book/chat.html) page.
+
+### [Discord](https://discord.gg/JfggvrHGDY)
+
+We have a Discord server as an alternative for Matrix, open the #join-requests channel and send a message requesting to be a member (the purpose of this is to avoid spam and bots)
+
+The Matrix messages are sent to Discord and vice-versa using a bot, but sometimes some Discord messages aren't sent to Matrix (if this happens to you join in our Matrix space above)
+
+## [GitLab](https://gitlab.redox-os.org/redox-os/redox)
+
+A slightly more formal way of communication with fellow Redox developers, but a little less quick and convenient like the chat. Submit an issue when you run into problems compiling or testing. Issues can also be used if you would like to discuss a certain topic: be it features, code style, code inconsistencies, minor changes and fixes, etc.
+
+If you want to create an account, read the [Signing in to GitLab](https://doc.redox-os.org/book/signing-in-to-gitlab.html) page.
+
+Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications).
+
+By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten.
+
+If you have ready MRs (merge requests) you must send the links in the [MRs](https://matrix.to/#/#redox-mrs:matrix.org) room. To join this room, you will need to request an invite in the [Join Requests](https://matrix.to/#/#redox-join:matrix.org) room.
+
+By sending a message in the room, your MR will not be forgotten or accumulate conflicts.
+
+## Best Practices and Guidelines
+
+You can read the best practices and guidelines on the [Best practices and guidelines](https://doc.redox-os.org/book/best-practices.html) chapter.
+
+## Style Guidelines
+
+### Rust
+
+Since **Rust** is a relatively small and new language compared to others like C and C++, there's really only one standard. Just follow the official Rust standards for formatting, and maybe run `rustfmt` on your changes, until we setup the CI system to do it automatically.
+
+### Git
+
+Please follow our [Git style](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for pull requests.
+
+## GitLab
+
+### Identity
+
+Once your GitLab account is created, you should add your Matrix or Discord username (the name after the `@` symbol) on the "About" section of your profile, that way we recognize you properly.
+
+### Issues
+
+To know how to create issues on the Redox GitLab, read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page.
+
+Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications).
+
+By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten.
+
+### Pull Requests
+
+Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests.
 
 ## Important Places to Contribute
 
@@ -157,38 +226,6 @@ We maintain a list of wikis, articles and videos to learn Rust, OS development a
 
 If you are skilled there's a possibility that they could improve your knowledge in some way.
 
-## Best Practices and Guidelines
-
-You can read the best practices and guidelines on the [Best practices and guidelines](https://doc.redox-os.org/book/best-practices.html) chapter.
-
-## Style Guidelines
-
-### Rust
-
-Since **Rust** is a relatively small and new language compared to others like C and C++, there's really only one standard. Just follow the official Rust standards for formatting, and maybe run `rustfmt` on your changes, until we setup the CI system to do it automatically.
-
-### Git
-
-Please follow our [Git style](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for pull requests.
-
-## GitLab
-
-### Identity
-
-Once your GitLab account is created, you should add your Matrix or Discord username (the name after the `@` symbol) on the "About" section of your profile, that way we recognize you properly.
-
-### Issues
-
-To know how to create issues on the Redox GitLab, read the [Filing Issues](https://doc.redox-os.org/book/filing-issues.html) page.
-
-Once you create an issue don't forget to post the link on the Dev or Support rooms of the chat, because the GitLab email notifications have distractions (service messages or spam) and most developers don't left their GitLab pages open to receive desktop notifications from the web browser (which require a custom setting to receive issue notifications).
-
-By doing this you help us to pay attention to your issues and avoid them to be accidentally forgotten.
-
-### Pull Requests
-
-Please follow [our process](https://doc.redox-os.org/book/creating-proper-pull-requests.html) for creating proper pull requests.
-
 ## Other Ways to Contribute
 
 If you aren't good on coding, but you still want to help keep the project going, you can contribute and support in a variety of ways! We'll try to find a way to use anything you have to offer. 

Makefile

@@ -10,28 +10,22 @@ all: $(BUILD)/harddrive.img
 live:
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	-$(FUMOUNT) /tmp/redox_installer/ || true
-	rm -f $(BUILD)/livedisk.iso
-	$(MAKE) $(BUILD)/livedisk.iso
+	rm -f $(BUILD)/redox-live.iso
+	$(MAKE) $(BUILD)/redox-live.iso
 
-netboot:
-	-$(FUMOUNT) $(BUILD)/filesystem/ || true
-	-$(FUMOUNT) /tmp/redox_installer/ || true
-	rm -rf $(BUILD)/livedisk.iso $(BUILD)/tftproot
-	$(MAKE) $(BUILD)/tftproot
-
-popsicle: $(BUILD)/livedisk.iso
-	popsicle-gtk $(BUILD)/livedisk.iso
+popsicle: $(BUILD)/redox-live.iso
+	popsicle-gtk $(BUILD)/redox-live.iso
 
 image:
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	-$(FUMOUNT) /tmp/redox_installer/ || true
-	rm -f $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
+	rm -f $(BUILD)/harddrive.img $(BUILD)/redox-live.iso
 	$(MAKE) all
 
 rebuild:
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	-$(FUMOUNT) /tmp/redox_installer/ || true
-	rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
+	rm -rf $(BUILD)/repo.tag $(BUILD)/harddrive.img $(BUILD)/redox-live.iso
 	$(MAKE) all
 
 clean: $(CONTAINER_TAG)

build.sh

@@ -34,7 +34,7 @@ usage()
     echo "               config/ARCH/CONFIG.toml"
     echo "               If you specify both CONFIG and FILESYSTEM_CONFIG, it is not"
     echo "               necessary that they match, but it is recommended."
-    echo "    Examples:  ./build.sh -c demo live - make build/x86_64/demo/livedisk.iso"
+    echo "    Examples:  ./build.sh -c demo live - make build/x86_64/demo/redox-live.iso"
     echo "               ./build.sh -6 qemu - make build/i686/desktop/harddrive.img and"
     echo "                                    and run it in qemu"
     echo "    NOTE:      If you do not change ARCH or CONFIG very often, edit mk/config.mk"

config/aarch64/ci.toml

@@ -23,6 +23,8 @@ installer = {}
 installer-gui = {}
 ion = {}
 kernel = {}
+libgcc = {}
+libstdcxx = {}
 #nano = {} # error compiling ncurses
 netdb = {}
 #netsurf = {} # error building openssl1

config/desktop.toml

@@ -21,7 +21,7 @@ orbdata = {}
 orbital = {}
 orbutils = {}
 pop-icon-theme = {}
-# rustpython = {} #TODO ensure RustPython builds with our toolchain
+rustpython = {}
 shared-mime-info = {}
 patchelf = {}
 
@@ -29,8 +29,10 @@ patchelf = {}
 path = "/usr/lib/init.d/20_orbital"
 data = """
 audiod
+export BROWSER /bin/netsurf-fb
 export VT 3
 orbital orblogin launcher
+unset BROWSER
 unset VT
 """
 

config/i686/ci.toml

@@ -23,6 +23,8 @@ installer = {}
 installer-gui = {}
 ion = {}
 kernel = {}
+libgcc = {}
+libstdcxx = {}
 nano = {}
 netdb = {}
 netsurf = {}

config/riscv64gc/ci.toml

@@ -23,6 +23,8 @@ installer = {}
 #installer-gui = {} # redox_syscall 0.4 not working on riscv64gc?
 ion = {}
 kernel = {}
+libgcc = {}
+libstdcxx = {}
 #nano = {} # error compiling ncurses
 netdb = {}
 #netsurf = {} # error compiling nghttp2

config/x86_64/ci.toml

@@ -84,12 +84,14 @@ kibi = {}
 lci = {}
 libc-bench = {}
 libffi = {}
+libgcc = {}
 libgmp = {}
 libiconv = {}
 libjpeg = {}
 libogg = {}
 liborbital = {}
 libpng = {}
+libstdcxx = {}
 #libsodium = {} # failing to fetch
 libvorbis = {}
 libxml2 = {}
@@ -167,7 +169,7 @@ rs-nes = {}
 rust64 = {}
 #rust-cairo = {} # linking errors
 #rust-cairo-demo = {} # linking errors
-#rustpython = {} # does not compile
+rustpython = {}
 rustual-boy = {}
 #schismtracker = {} # uses system includes
 scummvm = {}

cookbook

@@ -1 +1 @@
-Subproject commit ab8e300cf698eccf7a0fc7773c62980a87702a93
+Subproject commit cf34a9397d2c349be09e60aa4c69a457fb4a0678

mk/ci.mk

@@ -15,11 +15,11 @@ ci-img: FORCE
 
 # The name of the target must match the name of the filesystem config file
 minimal minimal-net server desktop demo: FORCE
-	rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso"
-	$(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso
+	rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/redox-live.iso"
+	$(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/redox-live.iso
 	mkdir -p $(IMG_DIR)
 	cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"
-	cp "build/$(ARCH)/$@/livedisk.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"
+	cp "build/$(ARCH)/$@/redox-live.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_redox-live.iso"
 
 # CI packaging target
 ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE

mk/disk.mk

@@ -12,7 +12,7 @@ $(BUILD)/harddrive.img: $(HOST_FSTOOLS) $(REPO_TAG)
 	umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) $@.partial
 	mv $@.partial $@
 
-$(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG)
+$(BUILD)/redox-live.iso: $(HOST_FSTOOLS) $(REPO_TAG) redox.ipxe
 	mkdir -p $(BUILD)
 	rm -rf $@  $@.partial
 	-$(FUMOUNT) /tmp/redox_installer || true
@@ -23,13 +23,7 @@ $(BUILD)/livedisk.iso: $(HOST_FSTOOLS) $(REPO_TAG)
 	truncate -s "$$FILESYSTEM_SIZE"m $@.partial
 	umask 002 && $(INSTALLER) $(INSTALLER_OPTS) -c $(FILESYSTEM_CONFIG) --write-bootloader="$(BUILD)/bootloader-live.efi" --live $@.partial
 	mv $@.partial $@
-
-$(BUILD)/tftproot: $(HOST_FSTOOLS) $(REPO_TAG) $(BUILD)/livedisk.iso
-	rm -r $(BUILD)/tftproot || true
-	mkdir $(BUILD)/tftproot
-	cp $(BUILD)/bootloader-live.efi $(BUILD)/tftproot/bootloader-live.efi
-	ln -s ../livedisk.iso $(BUILD)/tftproot/redox-live.img
-	cp redox.ipxe $(BUILD)/tftproot/redox.ipxe
+	cp redox.ipxe $(BUILD)/redox.ipxe
 
 $(BUILD)/filesystem.img: $(HOST_FSTOOLS) $(REPO_TAG)
 	mkdir -p $(BUILD)

mk/prefix.mk

@@ -86,7 +86,7 @@ $(PREFIX)/libtool:
 	echo $(LIBTOOL_VERSION) > $@.partial/.tarball-version
 	mv "$@.partial" "$@"
 
-$(PREFIX)/libtool-build: $(PREFIX)/libtool $(CONTAINER_TAG)
+$(PREFIX)/libtool-build: $(PREFIX)/libtool $(PREFIX)/rust-install
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else

mk/qemu.mk

@@ -108,7 +108,7 @@ ifneq ($(QEMU_KERNEL),)
 endif
 
 ifeq ($(live),yes)
-	DISK=$(BUILD)/livedisk.iso
+	DISK=$(BUILD)/redox-live.iso
 else
 	DISK=$(BUILD)/harddrive.img
 endif
@@ -151,7 +151,7 @@ else
 
 	EXTRANETARGS=
 	ifeq ($(netboot),yes)
-		EXTRANETARGS+=,tftp=$(BUILD)/tftproot,bootfile=redox.ipxe
+		EXTRANETARGS+=,tftp=$(BUILD),bootfile=redox.ipxe
 	endif
 
 	ifneq ($(bridge),)
@@ -242,10 +242,6 @@ qemu-deps:$(FIRMWARE)
 
 qemu-deps:$(QEMU_KERNEL)
 
-ifeq ($(netboot),yes)
-qemu-deps: $(BUILD)/tftproot
-endif
-
 qemu-deps: $(PFLASH0)
 
 ifneq ($(PFLASH1),)

mk/repo.mk

@@ -51,6 +51,16 @@ else
 	./clean.sh $*
 endif
 
+comma := ,
+
+# Invoke clean.sh for multiple targets
+cl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target))
+endif
+
 # Invoke fetch.sh for a single target
 f.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
@@ -62,6 +72,14 @@ else
 	./fetch.sh $*
 endif
 
+# Invoke fetch.sh for multiple targets
+fl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),f.$(target))
+endif
+
 # Invoke repo.sh for a single target
 r.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
@@ -73,6 +91,14 @@ else
 	./repo.sh $*
 endif
 
+# Invoke repo.sh for multiple targets
+rl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),r.$(target))
+endif
+
 # Invoke unfetch.sh for a single target
 u.%: $(FSTOOLS_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)
@@ -84,20 +110,64 @@ else
 	./unfetch.sh $*
 endif
 
+# Invoke unfetch.sh for multiple targets
+ul.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target))
+endif
+
 # Invoke clean.sh, and repo.sh for a single target
 cr.%: $(FSTOOLS_TAG) FORCE
 	$(MAKE) c.$*
 	$(MAKE) r.$*
 
+# Invoke clean.sh and repo.sh for multiple targets
+crl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target))
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),r.$(target))
+endif
+
 # Invoke unfetch.sh, clean.sh, and repo.sh for a single target
 ucr.%: $(FSTOOLS_TAG) FORCE
 	$(MAKE) u.$*
 	$(MAKE) cr.$*
 
+# Invoke unfetch.sh, clean.sh and repo.sh for multiple targets
+ucrl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target))
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),cr.$(target))
+endif
+
 uc.%: $(FSTOOLS_TAG) FORCE
 	$(MAKE) u.$*
 	$(MAKE) c.$*
 
+# Invoke unfetch.sh and clean.sh for multiple targets
+ucl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),u.$(target))
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),c.$(target))
+endif
+
 ucf.%: $(FSTOOLS_TAG) FORCE
 	$(MAKE) uc.$*
 	$(MAKE) f.$*
+
+# Invoke unfetch, clean.sh and fetch.sh for multiple targets
+ucfl.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),uc.$(target))
+	$(MAKE) $(foreach target,$(subst $(comma), ,$*),f.$(target))
+endif

native_bootstrap.sh

@@ -853,6 +853,36 @@ solus()
 	perl-html-parser
 }
 
+##############################################################################
+# This function takes care of installing all dependencies for building redox on
+# VoidLinux
+# @params:	$1 the emulator to install, virtualbox or qemu
+##############################################################################
+voidlinux()
+{
+
+	echo "Detected VoidLinux"
+
+	if [ "$1" == "qemu" ]; then
+		if [ -z "$(which qemu-system-x86_64)" ]; then
+			sudo xbps-install -S qemu
+		else
+			echo "QEMU already installed!"
+		fi
+	else
+		if [ -z "$(which virtualbox)" ]; then
+			echo "Please install Virtualbox and re-run this script,"
+			echo "or run with -e qemu"
+			exit
+		else
+			echo "Virtualbox already installed!"
+		fi
+	fi
+
+	echo "Installing necessary build tools..."
+	sudo xbps-install -S gcc make nasm wget pkg-config fuse-devel rsync automake gettext-devel libtool po4a patch bison flex gperf libpng-devel perl-HTML-Parser
+}
+
 ######################################################################
 # This function outlines the different options available for bootstrap
 ######################################################################
@@ -1090,6 +1120,8 @@ else
 	# FreeBSD
 	elif hash 2>/dev/null pkg; then
 		freebsd "$emulator"
+	elif hash 2>/dev/null xbps-install; then
+	  voidlinux "$emulator"
 	# Unsupported platform
 	else
     	printf "\e[31;1mFatal error: \e[0;31mUnsupported platform, please open an issue\e[0m\n"

redox.ipxe

@@ -1,5 +1,5 @@
 #!ipxe
 
 kernel bootloader-live.efi
-initrd redox-live.img
+initrd http://${next-server}:8080/redox-live.iso
 boot

relibc

@@ -1 +1 @@
-Subproject commit 63418095e578459452b341d6d3c084efabf7f574
+Subproject commit 74ebfb256d14af0b56a9572166e2239851d5c431

scripts/category.sh

@@ -10,13 +10,22 @@ then
     exit 1
 fi
 
-set -x
-
 action="${1#-}"
 
+recipe_list=""
+first=1
+
 for recipe in `find cookbook/recipes/"$2" -name "recipe.*"`
 do
     recipe_folder=`dirname "$recipe"`
     recipe_name=`basename "$recipe_folder"`
-    make "$action"."$recipe_name"
-done
+    if [ "$first" -eq 1 ]; then
+        recipe_list="$recipe_name"
+        first=0
+    else
+        recipe_list="$recipe_list,$recipe_name"
+    fi
+done
+
+set -x
+make "$action"l."$recipe_list"

scripts/ventoy.sh

@@ -24,7 +24,7 @@ for ARCH in "${ARCHS[@]}"
 do
     for CONFIG_NAME in "${CONFIGS[@]}"
     do
-        IMAGE="build/${ARCH}/${CONFIG_NAME}/livedisk.iso"
+        IMAGE="build/${ARCH}/${CONFIG_NAME}/redox-live.iso"
         make ARCH="${ARCH}" CONFIG_NAME="${CONFIG_NAME}" "${IMAGE}"
         cp -v "${IMAGE}" "${VENTOY}/redox-${CONFIG_NAME}-${ARCH}.iso"
     done