Merge branch 'master' of https://gitlab.redox-os.org/redox-os/redox

Add pkg-size script

See merge request redox-os/redox!1430

.gitignore

@@ -1,3 +1,4 @@
 /build/
 /prefix/
 .config
+**/my_*

.gitlab-ci.yml

@@ -1,11 +1,12 @@
-image: "ubuntu:20.04"
+image: "ubuntu:22.04"
 
 variables:
-  GIT_STRATEGY: "pull"
+  GIT_STRATEGY: "clone"
   GIT_SUBMODULE_STRATEGY: "recursive"
-  GIT_CHECKOUT: "true"
 
 before_script:
+ # Disable the wget progress bar
+ - echo 'show-progress = off' >> ~/.wgetrc
  - |
     export DEBIAN_FRONTEND=noninteractive
     apt-get update -qq &&
@@ -13,31 +14,27 @@ before_script:
         bison \
         build-essential \
         curl \
-        dosfstools \
         flex \
-        fuse \
-        genisoimage \
+        fuse3 \
         git \
-        gnupg \
         libfuse-dev \
         nasm \
-        parted \
         pkg-config \
-        software-properties-common \
-        syslinux \
-        syslinux-utils \
         texinfo \
-        wget &&
+        wget \
+        zstd &&
     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
 img:
     script:
      - |
         source "$HOME/.cargo/env" &&
-        cargo install --version 0.1.1 cargo-config &&
-        cargo install cargo-xbuild &&
-        cargo install --version 0.3.20 xargo &&
-        make ci-img IMG_TAG=$CI_COMMIT_REF_NAME
+        curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash &&
+        cargo binstall --no-confirm --version 0.1.1 cargo-config &&
+        cargo binstall --no-confirm --version 1.16.0 just &&
+        cargo binstall --no-confirm --version 0.26.0 cbindgen &&
+        cargo build --manifest-path installer/Cargo.toml --release &&
+        make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1
     artifacts:
         paths:
          - build/img/

.gitmodules

@@ -9,7 +9,8 @@
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
-	branch = redox-2022-03-18
+	branch = redox-2023-09-07
+	update = none
 [submodule "redoxfs"]
 	path = redoxfs
 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git

CONTRIBUTING.md

@@ -1,205 +1,141 @@
 # Contributing to Redox
 
-_**Thank you for your interest in contributing to Redox!** This document will outline the basics of where to start if you wish to contribute to the project. There are many ways to help us out and and we appreciate all of them. We look forward to **your contribution**!_
+**Thank you for your interest in contributing to Redox!**
 
-## Index
+This document will outline the basics of where to start if you wish to contribute to the project. There are many ways to help us out and and we appreciate all of them. We look forward to **your contribution!**
 
-* [Communication](#communication)
- * [Chat](#chat)
- * [GitLab Issues](#issues)
- * [Pull Requests](#prs)
- * [Discourse](#discourse)
- * [Reddit](#reddit)
- * [News](#news)
-* [Code Contributions](#code-contributions)
- * [Low-Hanging Fruit - Easy Targets for Newbies](#easy-targets)
- * [Creating a Pull Request](#creating-a-pr)
-* [Best Practices/Guidelines](#best-practices)
- * [General](#general)
- * [Kernel](#kernel)
- * [Testing Practices](#testing-practices)
-* [Style Guidelines](#style-guidelines)
- * [Rust](#rust-style-guidelines)
- * [Git](#git-style-guidelines)
-* [Other Ways to Contribute](#other)
- * [Graphic Design](#graphic-design)
- * [Patreon](#patreon)
+## Code Of Conduct
 
-## <a name="extern-links"> Other External Links </a>
+We follow the [Rust Code Of Conduct](https://www.rust-lang.org/policies/code-of-conduct).
 
-* [redox-os.org](https://redox-os.org)
-* [rust-os-comparison](https://github.com/flosse/rust-os-comparison)
-* [rust-lang.org](http://rust-lang.org)
+## License
 
-## <a name="communication"> Communication </a>
+In general, your contributions to Redox are governed by the [MIT License](https://en.wikipedia.org/wiki/MIT_License). Each project repository has a `LICENSE` file that provides the license terms for that project.
 
-### <a name="chat"> Chat </a>
+Please review the LICENSE for the project you are contributing to.
 
-The quickest and most open way to **communicate with the Redox team** is on our **chat server**. Currently, you can only get an invite by sending an email request to [info@redox-os.org](mailto:info@redox-os.org), which might take a little while, since it's not automated. Simply say you'd like to join the chat. We're working on an better way to do this, but this is the best way right now.
+On [this](https://doc.redox-os.org/book/ch01-02-philosophy.html) page we explain why we use the MIT license.
 
-### <a name="issues"> GitLab Issues </a>
+## Chat
 
-A bit more formal way of communication with fellow Redox devs, but a little less quick and convenient like the chat. Submit an issue when you run into problems compiling, testing, or just would like to discuss a certain topic, be it _features, code style, code inconsistencies, minor changes and fixes, etc._
+Join us on [Matrix Chat](https://doc.redox-os.org/book/ch13-01-chat.html) to discuss issues or ask questions.
 
-### <a name="prs"> Pull Requests </a>
+## Important Places to Contribute
 
-It's fine to just submit a small pull request without first making an issue or asking in the chat, **unless** it's a significant change that will require a lot of planning and reviewing. Also see [Creating a Pull Request](#creating-a-pr) and [Git Style Guidelines](#git-style-guidelines).
+(Before starting to contribute you **must** read the [FAQ](https://www.redox-os.org/faq/) and the [Redox Book](https://doc.redox-os.org/book/))
 
-### <a name="discourse"> Discourse </a>
+You can contribute to the Redox documentation and code on these repositories:
 
-We have a **discourse forum** at [discourse.redox-os.org](https://discourse.redox-os.org). This is the best way to discuss more general topics that aren't about specific things that need to be addressed one way or another. You can sign up like any other website.
+(The order is based on difficulty, easy things first)
 
-### <a name="reddit"> Reddit </a>
+- [Website](https://gitlab.redox-os.org/redox-os/website)
+- [Book](https://gitlab.redox-os.org/redox-os/book) - High-level documentation
+- [Build System Configuration](https://gitlab.redox-os.org/redox-os/redox) - Our main repository
+- [Cookbook](https://gitlab.redox-os.org/redox-os/cookbook) - Ports system
+- [Orbital](https://gitlab.redox-os.org/redox-os/orbital) - Display server and window manager
+- [Package Manager](https://gitlab.redox-os.org/redox-os/pkgutils)
+- [relibc](https://gitlab.redox-os.org/redox-os/relibc) - Redox C Library
+- [Drivers](https://gitlab.redox-os.org/redox-os/drivers) - Device daemons
+- [Kernel](https://gitlab.redox-os.org/redox-os/kernel)
 
-You can also find **Redox on Reddit** in [/r/rust/](https://www.reddit.com/r/rust) and [/r/redox/](https://www.reddit.com/r/redox). Redox news and discussion is posted on the latter, and Rust news and discussion, as well as some Redox posts, is on the former.
+### Skill Levels
 
-### <a name="news"> News </a>
+If you aren't fluent in Rust:
 
-News and updates for Redox are posted at [redox-os.org/news](https://redox-os.org/news). It's more one-way than the other things on this list, but it should provide a good summary of what's been going on with the project lately. It's usually updated weekly, but with some exceptions. A mailing list may be included eventually, but it's not set up right now.
+- Write documentation
+- Use and test Redox, fill issues for bugs or needed features (please verify the repository issues before)
+- Web development on the website (we don't accept JavaScript code)
+- Write unit tests (may require minimal knowledge of Rust)
 
-## <a name="code-contributions"> Code Contributions </a>
+If you are fluent in Rust, but not operating system Development:
 
-### <a name="easy-targets"> Low-Hanging Fruit - Easy Targets for Newbies </a>
+- Improve the Orbital display server and window manager.
+- Port programs written in Rust to Redox (in most cases you need to port crates, be aware of missing functions on relibc, porting without these functions will make patches dirty)
+- Improve the program compatibility in relibc
+- Improve the package manager
+- Improve the [Ion](https://gitlab.redox-os.org/redox-os/ion) shell
 
-#### If you're not fluent in Rust:
+If you are fluent in Rust, and have experience with operating system development:
 
- * Writing _documentation_
- * **Using/testing Redox**, filing issues for bugs and needed features
- * **Web development** ([Redox website, separate repo](https://gitlab.redox-os.org/redox-os/website))
- * **Writing unit tests** (may require minimal knowledge of rust)
+- Familiarize yourself with the repository and code
+- Grep for `TODO`, `FIXME`, `BUG`, `UNOPTIMIZED`, `REWRITEME`, `DOCME`, and `PRETTYFYME` and fix the code you find
+- Update old code to remove warnings
+- Improve and optimize code, especially in the kernel
+- Write device drivers
 
-#### If you are fluent in Rust, but not OS Development:
+For those who want to contribute to the Redox GUI, our GUI strategy has recently changed.
 
- * **Apps** development
- * **Shell** ([Ion](https://gitlab.redox-os.org/redox-os/ion)) development
- * **Package management** ([pkgutils](https://gitlab.redox-os.org/redox-os/pkgutils)) development
- * Other high-level code tasks
+- We are improving the [Orbital](https://gitlab.redox-os.org/redox-os/orbital) display server and window manager, you can read more about it on [this](https://gitlab.redox-os.org/redox-os/redox/-/issues/1430) tracking issue.
+- Redox is in the process of adopting other Rust-written GUI toolkits, such as [Iced](https://iced.rs) and [Slint](https://slint-ui.com/). Please check out those projects if this is your area of interest.
+- OrbTk is in maintenance mode, and its developers have moved to other projects such as the ones below. There is currently no Redox-specific GUI development underway.
 
-#### If you are fluent in Rust, and have experience with OS Dev:
+## Tracking Issues Index
 
- * Familiarize yourself with the repository and codebase
- * Grep for `TODO`, `FIXME`, `BUG`, `UNOPTIMIZED`, `REWRITEME`, `DOCME`, and `PRETTYFYME` and fix the code you find.
- * **Improve and optimize code, especially in the kernel**
+We use an index to track the development priorities, you can find them on [this](https://gitlab.redox-os.org/redox-os/redox/-/issues/1384) page.
 
-### <a name="creating-a-pr"> Creating a Pull Request </a>
+## Build System
 
-**1**. _**Fork**_ the repository
+You can find the Redox build system organization and commands on [this](https://doc.redox-os.org/book/ch08-06-build-system-reference.html) page.
 
-**2**. Clone the _original repository_ to your local PC using one of the following commands based on the protocol you are using:
- * HTTPS:`git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive`
- * SSH:`git clone git@gitlab.redox-os.org:redox-os/redox.git --origin upstream --recursive`
- * Then rebase: `git rebase upstream master`
- If you use HTTPS, you will have to log in each time when pushing to your fork. (Recommended: learn about git SSH support, it logs in automatically using SSH keys)
- 
-**3**. **Add** your fork with
- * HTTPS:`git remote add origin https://gitlab.redox-os.org/your-username/redox.git`
- * SSH:`git remote add origin git@gitlab.redox-os.org:your-username/redox.git`
- 
-**4**. Alternatively, if you already have a fork and copy of the repo, you can simply check to **make sure you're up-to-date**
- * Pull the upstream:`git pull upstream --rebase`
- * Update the submodules:`git submodule update --recursive --init`
- 
-**5**. Create a _**separate branch**_ (recommended if you're making multiple changes simultaneously) (`git checkout -b my-branch`)
+## Developer FAQ
 
-**6**. _Make changes_
+You can see the most common questions and problems on [this](https://doc.redox-os.org/book/ch09-07-developer-faq.html) page.
 
-**7**. **Commit** (`git add <item(s) you changed>; git commit`) and write your commit message
+## Porting Software
 
-**8**. Optionally run [rustfmt](https://github.com/rust-lang-nursery/rustfmt) on the _files you changed_ and commit again if it did anything (check with `git diff` first)
+You can read how to use the Cookbook recipe system to port applications on [this](https://doc.redox-os.org/book/ch09-03-porting-applications.html) page.
 
-**9**. Test your changes by **cleaning** (`make clean; git clean -Xfd`) and **building** with `make qemu` (you might have to use `make qemu kvm=no`) or `make virtualbox`.
-(see [Best Practices and Guidelines](#best-practices))
+## Libraries and APIs
 
-**10**. _**Pull**_ from upstream (`git pull upstream --rebase`) (Note: Make sure to include `--rebase`, as it will apply your changes on top of the changes you just pulled, allowing for a much cleaner merge)
+You can read [this](https://doc.redox-os.org/book/ch09-06-libraries-apis.html) page to learn about the libraries and APIs used in Redox.
 
-**11**. Repeat step **9** to make sure the rebase still builds and starts
+## Development Tips
 
-**12**. Push to **your fork** (`git push origin <branch>`), `<branch>` being the branch you created earlier
+You can find important tips on [this](https://doc.redox-os.org/book/ch09-02-coding-and-building.html#development-tips) section.
 
-**13**. Create a _pull request_
+## References
 
-**14**. If your changes are _minor_, you can just describe them in a paragraph or less. If they're _major_, please fill out the provided form.
+We maintain a list of wikis, articles and videos to learn Rust, OS development and computer science on [this](https://doc.redox-os.org/book/ch09-08-references.html) page.
 
-**15. Submit!**
+If you are skilled there's a possibility that they could improve your knowledge in some way.
 
-## <a name="best-practices"> Best Practices and Guidelines </a>
+## Best Practices and Guidelines
 
-### <a name="general"> General </a>
+You can read the best practices and guidelines on [this](https://doc.redox-os.org/book/ch11-00-best-practices.html) chapter.
 
-* **Remember to do a `git rebase -i upstream/master` before you send your patch!**
-* **Make sure your code is readable, commented, and well-documented.**
-* **Don't hesitate to ask for help, comments or suggestions!**
-* **Before implementing something, discuss it! Open an issue, or ask in the chat.**
+## Style Guidelines
 
-##### On the more technical side:
-* Test, test, and test!
-* Follow the style conventions (See [rust style guidelines](#rust-style-guidelines))
-* Use `std::mem::replace` and `std::mem::swap` when you can.
-* `libredox` should be 1-to-1 with the official `libstd`.
-* Prefer `.into()` and `.to_owned()` over `.to_string()`.
-* Prefer passing references to the data over owned data. (Don't take `String`, take `&str`. Don't take `Vec<T>` take `&[T]`).
-* Use generics, traits, and other abstractions Rust provides.
-* Avoid using lossy conversions (for example: don't do `my_u32 as u16 == my_u16`, prefer `my_u32 == my_u16 as u32`).
-* Prefer in place (`box` keyword) when doing heap allocations.
-* Prefer platform independently sized integer over pointer sized integer (`u32` over `usize`, for example).
-* Follow the usual idioms of programming, such as "composition over inheritance", "let your program be divided in smaller pieces", and "resource acquisition is initialization".
-* When `unsafe` is unnecessary, don't use it. **Longer safe code is better than shorter unsafe code!**
-* Be sure to mark parts that need work with `TODO`, `FIXME`, `BUG`, `UNOPTIMIZED`, `REWRITEME`, `DOCME`, and `PRETTYFYME`. Always elaborate on these messages, too. Nothing is more annoying than seeing a `TODO` and not knowing how to actually fix it.
-* Use the compiler hint attributes, such as `#[inline]`, `#[cold]`, etc. when it makes sense to do so.
-* Check the [chat](#chat), [the website](http://redox-os.org/news), and [the Rust subreddit](https://www.reddit.com/r/rust) frequently.
+### Rust
 
-### <a name="kernel"> Kernel </a>
+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.
 
-* When trying to access a slice, **always** use the `common::GetSlice` trait and the `.get_slice()` method to get a slice without causing the kernel to panic.
-  The problem with slicing in regular Rust, e.g. `foo[a..b]`, is that if someone tries to access with a range that is out of bounds of an array/string/slice, it will cause a panic at runtime, as a safety measure. Same thing when accessing an element.
-  Always use `foo.get(n)` instead of `foo[n]` and try to cover for the possibility of `Option::None`. Doing the regular way may work fine for applications, but never in the kernel. No possible panics should ever exist in kernel space, because then the whole OS would just stop working.
+### Git
 
-### <a name="testing-practices"> Testing Practices </a>
+Please follow our [Git style](https://doc.redox-os.org/book/ch12-04-creating-proper-pull-requests.html) for pull requests.
 
-* It's always better to test boot (`make qemu` or `make virtualbox`) every time you make a change, because it is important to see how the OS boots and works after it compiles.
-  Even though Rust is a safety-oriented language, something as unstable and low-level as an in-dev operating system will almost certainly have problems in many cases and may completely break on even the slightest critical change.
-  Also, make sure you check how the unmodified version runs on your machine before making any changes. Else, you won't have anything to compare to, and it will generally just lead to confusion. TLDR: Rebuild and test boot often.
+## GitLab
 
-* To run the **ZFS** tests:
- * Create the zfs.img only once. If one has not been created, run `make filesystem/apps/zfs/zfs.img` before booting into Redox.
- * Run `open zfs.img` to open the created ZFS image.
- * Run `file /home/LICENSE.md` twice to ensure ARC isn't broken.
+### Issues
 
-## <a name="style-guidelines"> Style Guidelines </a>
+To know how to create issues on the Redox GitLab, read [this](https://doc.redox-os.org/book/ch12-05-filing-issues.html) page.
 
-### <a name="rust-style-guidelines"> Rust </a>
+### Pull Requests
 
-Since **Rust** is a relatively small and new language compared to others like _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.
+Please follow [our process](https://doc.redox-os.org/book/ch12-04-creating-proper-pull-requests.html) for creating proper pull requests.
 
-### <a name="git-style-guidelines"> Git </a>
+## Other Ways to Contribute
 
-* You should have a fork of the repository on **GitHub** and a local copy on your computer. The local copy should have two remotes; `upstream` and `origin`, `upstream` should be set to the main repository and `origin` should be your fork.
-* When you start to make changes, you will want to create a separate branch, and keep the `master` branch of your fork identical to the main repository, so that you can compare your changes with the main branch and test out a more stable build if you need to.
-* Usually, when syncing your local copy with the master branch, you'll want to rebase instead of merge. This is because it will create duplicate commits that don't actually do anything when merged into the master branch. You can do this in one command with `git pull upstream --rebase`. This will pull from the upstream, then roll back to the current state of the upstream, and "replay" your changes on top of it. Make sure you commit before doing this, though. Git won't be able to rebase if you don't.
-* Prefer to omit the `-m` when using `git commit`. This opens your editor and should help get you in the habit of writing longer commit messages.
-* Commit messages should describe their changes in present tense, e.g. "`Add stuff to file.ext`" instead of "`added stuff to file.ext`". This makes sense as sometimes when you revert back, then run through commits one-by-one, you want to see what a commit will do, instead of just what the person did when they made the commit. It's also just being consistent.
-* Try to remove useless duplicate/merge commits from PRs as these don't do anything except clutter up history and make it harder to read.
+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. 
 
-## <a name="other"> Other Ways to Contribute </a>
+### Design
 
-If you're not big on coding, but you still want to help keep the project going, you can still contribute/support in a variety of ways! We'll try to find a way to use anything you have to offer. 
+If you're a good designer, whether it's 2D graphics, 3D graphics, interfaces, web design, you can help. We need logos, UI design, UI skins, app icons, desktop backgrounds, etc.
 
-### <a name="design"> Design </a>
+- [Redox backgrounds](https://gitlab.redox-os.org/redox-os/backgrounds) - You can send your wallpapers on this repository.
+- [Redox assets](https://gitlab.redox-os.org/redox-os/assets) - You can send your logos, icons and themes on this repository.
 
-If you're a good designer, whether it's _2D graphics, 3D graphics, interfaces, web design, you can help. We need logos, UI design, UI skins, app icons, desktop backgrounds, etc_. More information to come on this in the future, for now just join [the chat](#chat) and ask about graphic design.
+If you have questions about the graphic design, ask us on the [Chat](https://doc.redox-os.org/book/ch13-01-chat.html).
 
-### <a name="patreon"> Patreon </a>
-
-Our **BDFL**, [jackpot51](https://gitlab.redox-os.org/jackpot51), has a [Patreon campaign](https://www.patreon.com/redox_os)! **All money received will go towards Redox OS development**. If you donate, you will be listed in the **Redox credits** as one of the people that made Redox OS possible. You'll also get other rewards the more you donate. However, please don't donate if you can't afford it.
-
-<!--
-
-POSSIBLE OTHER TOPICS TO INCLUDE
-- Merch (maybe in the future)
-- Sound Design (things like notifications, popups, etc. for orbital)
-- Video Production/Motion Graphics (tutorials, introduction videos, etc.)
-- Non-Rust programming, scripting, etc. (if we even have a need for this)
-- Hosting/download/git mirrors (this is not needed right now, but when downloads increase it may be necessary)
-
--->
+### Donate to Redox
 
+If you are interested in donating to the Redox OS Nonprofit, you can find instructions [here](https://www.redox-os.org/donate/).

HARDWARE.md

@@ -1,123 +1,327 @@
-# Redox 0.8.0 Hardware Compatibility
+# Hardware Compatibility
 
-Updated on November 11, 2022 in preparation for the 0.8.0 release. Systems are
-rated on a scale of 🚫 Broken, ⚠️ Booting, and ✅ Recommended. Broken means the
-system cannot boot to a desktop, booting means the system boots to a desktop
-but has issues, and recommended means the system provides all implemented
-features.
+This document tracks the current hardware compatibility of Redox.
+
+- [Status](#status)
+- [General](#general)
+- [Template](#template)
+- [x86-64](#x86-64)
+    - [System76](#system76)
+    - [Dell](#dell)
+    - [HP](#hp)
+    - [ASUS](#asus)
+    - [Lenovo](#lenovo)
+    - [Toshiba](#toshiba)
+    - [Custom](#custom)
+- [i686](#i686)
+    - [Dell](#dell-1)
+    - [ASUS](#asus-1)
+    - [Lenovo](#lenovo-1)
+    - [Toshiba](#toshiba-1)
+    - [Panasonic](#panasonic)
+    - [Custom](#custom-1)
+- [ARM64](#arm64)
+    - [Custom](#custom-2)
+
+## Status
+
+- Broken - The system can't boot.
+- Booting - The system boots with some issues.
+- Recommended - The system start with all features working.
 
 ## General
 
-Due to incomplete USB support, desktops are generally not recommended.
+This section cover things to consider.
 
-- USB support is incomplete
-- Wireless networking is not supported
+- ACPI support is incomplete (some things are hardcoded on the kernel)
+- USB support is incomplete (desktops are generally not recommended)
+- Wi-Fi is not supported
+- GPU drivers aren't supported (only VESA and GOP)
+- Automatic operating system discovery on boot loader is not implemented (remember this before installing Redox)
 
-## x86_64
+## Template
 
-Test performed using https://static.redox-os.org/img/x86_64/redox_desktop_x86_64_2022-11-11_629_livedisk.iso
+You will use this template to insert your computer.
 
-### Lenovo IdeaPad Y510P
+- **Computer model**
 
-Status: ✅ Recommended
+```
+Status - (Broken, Booting or Recommended)
+Redox version - 0.0.0
+Variant - (server-minimal, desktop-minimal, server, desktop, demo, dev or customized)
+Image date - day-month-year
 
-- Booted using both BIOS and UEFI
-- Boots to desktop
+- Additional details goes here as items
+```
 
-### System76 Galago Pro (galp5)
+## x86-64
 
-Status: ✅ Recommended
+Computers using a 64 bits Intel/AMD CPU.
+
+### System76
+
+- **System76 Galago Pro (galp5)**
+
+```
+Status - Recommended
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using UEFI
 - Boots to desktop
+```
 
-### System76 Lemur Pro (lemp9)
+- **System76 Lemur Pro (lemp9)**
 
-Status: ✅ Recommended
+```
+Status - Recommended
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using UEFI
 - Boots to desktop
+```
 
-### Dell XPS 13 (9350)
+- **System76 Oryx Pro (oryp10)**
 
-Status: ⚠️ Booting
-
-- Booted using both BIOS and UEFI
-- Boots to desktop
-- NVMe driver livelocks
-
-### HP Dev One
-
-Status: ⚠️ Booting
-
-- Booted using UEFI
-- Boots to desktop
-- No touchpad support, requires I2C HID
-
-### System76 Oryx Pro (oryp10)
-
-Status: ⚠️ Booting
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using UEFI
 - Boots to desktop
 - No touchpad support, though it should be working
+```
 
-### System76 Pangolin (pang12)
+- **System76 Pangolin (pang12)**
 
-Status: ⚠️ Booting
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using UEFI
 - Boots to desktop
 - No touchpad support, requires I2C HID
+```
 
-### Toshiba Satellite L500
+### Dell
 
-Status: ⚠️ Booting
+- **Dell XPS 13 (9350)**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using both BIOS and UEFI
+- Boots to desktop
+- NVMe driver livelocks
+```
+
+### HP
+
+- **HP Dev One**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using UEFI
+- Boots to desktop
+- No touchpad support, requires I2C HID
+```
+
+### ASUS
+
+- **ASUS X554L**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using BIOS
+- Boots to desktop
+- No audio, HDA driver cannot find output pins
+```
+
+- **ASUS ROG g55vw**
+
+```
+Satus - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2023
+
+- Booted using BIOS
+- Boots to desktop
+- UEFI panic in SETUP
+```
+
+### Lenovo
+
+- **Lenovo IdeaPad Y510P**
+
+```
+Status - Recommended
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using both BIOS and UEFI
+- Boots to desktop
+```
+
+- **Lenovo G570**
+
+```
+Status - Broken
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using BIOS
+- Correct video mode not offered, this is a firmware issue
+- Bootloader panics in alloc_zeroed_page_aligned
+```
+
+### Toshiba
+
+- **Toshiba Satellite L500**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using BIOS
 - Correct video mode not offered, this is a firmware issue
 - Boots to desktop
 - No ethernet driver
+```
+
+### Custom
+
+If you have a customized computer, put it here.
+
+
 
 ## i686
 
-Test performed using https://static.redox-os.org/img/i686/redox_desktop_i686_2022-11-11_629_livedisk.iso
+Computers with a 32 bits Intel/AMD CPU.
 
-### Asus Eee PC 900
+### Dell
 
-Status: ⚠️ Booting
+- **Dell XPS 13 (9350)**
 
-- Booted using BIOS
-- Correct video mode not offered, this is a firmware issue
-- Boots to desktop
-- No ethernet driver
-
-### Dell XPS 13 (9350)
-
-Status: ⚠️ Booting
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using BIOS
 - Boots to desktop
 - NVMe driver livelocks
+```
 
-### Lenovo IdeaPad Y510P
+### ASUS
 
-Status: 🚫 Broken
+- **ASUS Eee PC 900**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using BIOS
+- Correct video mode not offered, this is a firmware issue
+- Boots to desktop
+- No ethernet driver
+```
+
+### Lenovo
+
+- **Lenovo IdeaPad Y510P**
+
+```
+Status - Broken
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using BIOS
 - Panics on phys_to_virt overflow, probably having invalid mappings for 32-bit
+```
 
-### Panasonic Toughbook CF-18
+### Toshiba
 
-Status: 🚫 Broken
+- **Toshiba Satellite L500**
 
-- Booted using BIOS
-- Hangs after PIT initialization
-
-### Toshiba Satellite L500
-
-Status: 🚫 Broken
+```
+Status - Broken
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
 
 - Booted using BIOS
 - Correct video mode not offered, this is a firmware issue
 - Panics on phys_to_virt overflow, probably having invalid mappings for 32-bit
+```
+
+### Panasonic
+
+- **Panasonic Toughbook CF-18**
+
+```
+Status - Broken
+Redox version - 0.8.0
+Variant - desktop
+Image date - 11-11-2022
+
+- Booted using BIOS
+- Hangs after PIT initialization
+```
+
+### Custom
+
+If you have a customized computer, put it here.
+
+
+
+## ARM64
+
+Computers using a 64 bits ARM CPU.
+
+### Raspberry Pi
+
+- **Raspberry Pi 3 Model B+**
+
+```
+Status - Booting
+Redox version - 0.8.0
+Variant - server
+Image date - None
+
+- Booted using Uboot
+- Boots to UART serial console
+- a bcm2835-sdhci/mmc driver
+- pl011 UART
+```
+
+### Custom
+
+If you have a customized ARM board, put it here.
+

Makefile

@@ -6,7 +6,20 @@ include mk/depends.mk
 
 all: $(BUILD)/harddrive.img
 
-live: $(BUILD)/livedisk.iso
+live:
+	-$(FUMOUNT) $(BUILD)/filesystem/ || true
+	-$(FUMOUNT) /tmp/redox_installer/ || true
+	rm -f $(BUILD)/livedisk.iso
+	$(MAKE) $(BUILD)/livedisk.iso
+
+popsicle: $(BUILD)/livedisk.iso
+	popsicle-gtk $(BUILD)/livedisk.iso
+
+image:
+	-$(FUMOUNT) $(BUILD)/filesystem/ || true
+	-$(FUMOUNT) /tmp/redox_installer/ || true
+	rm -f $(BUILD)/harddrive.img $(BUILD)/livedisk.iso
+	$(MAKE) all
 
 rebuild:
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
@@ -19,6 +32,7 @@ ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
 	cd cookbook && ./clean.sh
+	-rm -rf cookbook/repo
 	cargo clean --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo clean --manifest-path installer/Cargo.toml
 	cargo clean --manifest-path redoxfs/Cargo.toml
@@ -37,7 +51,7 @@ else
 endif
 
 pull:
-	git pull --recurse-submodules
+	git pull
 	git submodule sync --recursive
 	git submodule update --recursive --init
 
@@ -48,6 +62,9 @@ repo: $(BUILD)/repo.tag
 # Podman build recipes and vars
 include mk/podman.mk
 
+# Disk Imaging and Cookbook tools
+include mk/fstools.mk
+
 # Cross compiler recipes
 include mk/prefix.mk
 
@@ -73,15 +90,11 @@ else
 endif
 
 gdb: FORCE
-	gdb cookbook/recipes/kernel/build/kernel.sym --eval-command="target remote localhost:1234"
+	gdb cookbook/recipes/core/kernel/target/$(TARGET)/build/kernel.sym --eval-command="target remote localhost:1234"
 
 # An empty target
 FORCE:
 
-# Gzip any binary
-%.gz: %
-	gzip -k -f $<
-
 # Wireshark
 wireshark: FORCE
 	wireshark $(BUILD)/network.pcap

README.md

@@ -2,31 +2,65 @@
 <img alt="Redox" width="346" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/logos/redox/logo.png">
 </p>
 
-**Redox** is an operating system written in Rust, a language with focus on safety and high performance. Redox, following the microkernel design, aims to be secure, usable, and free. Redox is inspired by previous kernels and operating systems, such as SeL4, MINIX, Plan 9, and BSD.
+[Redox](https://www.redox-os.org) is an operating system written in Rust, a language with focus on safety, efficiency and high performance. Redox, following the microkernel design, aims to be reliable, secure, usable, correct and free. Redox is inspired by previous operating systems, such as seL4, MINIX, Plan 9, Linux and BSD.
 
-Redox _is not_ just a kernel, it's a **full-featured Operating System**, providing packages (memory allocator, file system, display manager, core utilities, etc.) that together make up a functional and convenient operating system. You can loosely think of it as the GNU or BSD ecosystem, but in a memory safe language and with modern technology. See [this list](#ecosystem) for overview of the ecosystem.
+Redox _is not_ just a kernel, it's a **full-featured operating system**, providing components (memory allocator, file system, display manager, core utilities, etc.) that together make up a functional and convenient operating system. You can loosely think of it as the GNU or BSD ecosystem, but in a memory safe language and with modern technology.
 
-The website can be found at https://www.redox-os.org. For hardware compatibility, see [HARDWARE.md](HARDWARE.md).
-
-Please make sure you use the **latest nightly** of `rustc` before building (for more troubleshooting, see ["Help! Redox won't compile!"](#compile-help)).
-
-[![Travis Build Status](https://travis-ci.org/redox-os/redox.svg?branch=master)](https://travis-ci.org/redox-os/redox)
 [![Downloads](https://img.shields.io/github/downloads/redox-os/redox/total.svg)](https://gitlab.redox-os.org/redox-os/redox/tags)
 [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
-![Rust Version](https://img.shields.io/badge/rust-nightly%202017--10--03-lightgrey.svg)
 
-## Contents
+## Guide
 
-* [What it looks like](#screenshots)
-* [Ecosystem](#ecosystem)
-* [Help! Redox won't compile](#compile-help)
-* [Contributing to Redox](#contributing)
-* [Cloning, Building and running](#cloning-building-running)
- * [Quick Setup](#quick-setup)
- * [Manual Setup](#manual-setup)
- * [Setup Using Docker](#setup-using-docker)
+This is the main repository of the Redox GitLab where the build system files are stored, this README is used to guide new developers.
 
-## <a name="screenshots"> What it looks like </a>
+You can find the most important pages below:
+
+- [Book](https://doc.redox-os.org/book/)
+- [Contribute](CONTRIBUTING.md)
+- [Hardware Compatibility](HARDWARE.md)
+- [Trying Out Redox](https://doc.redox-os.org/book/ch02-04-trying-out-redox.html)
+- [Building Redox](https://doc.redox-os.org/book/ch02-05-building-redox.html)
+- [Build System Documentation](https://doc.redox-os.org/book/ch08-06-build-system-reference.html)
+- [Developer FAQ](https://doc.redox-os.org/book/ch09-07-developer-faq.html)
+- [Chat/Discussions/Help](https://doc.redox-os.org/book/ch13-01-chat.html)
+
+## Ecosystem
+
+These are the most important repositories available on the Redox GitLab:
+
+| Name (lexicographic order)                                                           | Maintainer
+|--------------------------------------------------------------------------------------|---------------------------
+| [acid (kernel integration tests)](https://gitlab.redox-os.org/redox-os/acid)         | **@jackpot51**
+| [binutils](https://gitlab.redox-os.org/redox-os/binutils)                            | **@jackpot51**
+| [cookbook](https://gitlab.redox-os.org/redox-os/cookbook)                            | **@jackpot51** **@hatred_45** **@ids1024**
+| [coreutils](https://gitlab.redox-os.org/redox-os/coreutils)                          | **@jackpot51**
+| [extrautils](https://gitlab.redox-os.org/redox-os/extrautils)                        | **@jackpot51**
+| [games](https://gitlab.redox-os.org/redox-os/games)                                  | **@fabiao**
+| [Ion (shell)](https://gitlab.redox-os.org/redox-os/ion)                              | **@jackpot51**
+| [ipcd](https://gitlab.redox-os.org/redox-os/ipcd)                                    | **@jackpot51**
+| [kernel](https://gitlab.redox-os.org/redox-os/kernel)                                | **@jackpot51**
+| [libextra](https://gitlab.redox-os.org/redox-os/libextra)                            | **@jackpot51**
+| [libpager](https://gitlab.redox-os.org/redox-os/libpager)                            | **@jackpot51**
+| [netstack](https://gitlab.redox-os.org/redox-os/netstack)                            | **@jackpot51**
+| [netutils](https://gitlab.redox-os.org/redox-os/netutils)                            | **@jackpot51**
+| [orbclient (Orbital client)](https://gitlab.redox-os.org/redox-os/orbclient)         | **@jackpot51** **@FloVanGH**
+| [orbdata](https://gitlab.redox-os.org/redox-os/orbdata)                              | **@jackpot51**
+| [orbgame (Orbital 2D game engine)](https://gitlab.redox-os.org/redox-os/orbgame)     | **@FloVanGH**
+| [Orbital (windowing and compositing system)](https://gitlab.redox-os.org/redox-os/orbital) | **@jackpot51**
+| [orbtk (Orbital toolkit)](https://gitlab.redox-os.org/redox-os/orbtk)                | **@FloVanGH**
+| [orbutils (Orbital utilities)](https://gitlab.redox-os.org/redox-os/orbutils)        | **@jackpot51**
+| [pkgutils (current package manager)](https://gitlab.redox-os.org/redox-os/pkgutils)  | **@jackpot51**
+| [ralloc](https://gitlab.redox-os.org/redox-os/ralloc)                                | **@jackpot51**
+| [RANSID (Rust ANSI driver)](https://gitlab.redox-os.org/redox-os/ransid)             | **@jackpot51**
+| [redoxfs (default filesystem)](https://gitlab.redox-os.org/redox-os/redoxfs)             | **@jackpot51**
+| [relibc (C Library in Rust)](https://gitlab.redox-os.org/redox-os/relibc)            | **@jackpot51**
+| [small (stack String and other collections)](https://gitlab.redox-os.org/redox-os/small) | **@jackpot51**
+| [syscall](https://gitlab.redox-os.org/redox-os/syscall)                              | **@jackpot51**
+| [Sodium (Vim-inspired text editor)](https://gitlab.redox-os.org/redox-os/sodium)     | **@jackpot51**
+| [The Redox book](https://gitlab.redox-os.org/redox-os/book)                          |    **@hatred_45**
+| [userutils](https://gitlab.redox-os.org/redox-os/userutils)                          | **@jackpot51**
+
+## What it looks like
 
 <img alt="Redox" height="150" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/Senza%20titolo.jpeg">
 <img alt="Redox" height="150" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/redox running.jpeg">
@@ -36,137 +70,4 @@ Please make sure you use the **latest nightly** of `rustc` before building (for
 <img alt="Redox" height="150" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/Boot.png">
 <img alt="Redox" height="150" src="https://gitlab.redox-os.org/redox-os/assets/raw/master/screenshots/IMG_1459.PNG">
 
-## <a name="ecosystem"> Ecosystem </a>
-
-The ecosystem and software Redox OS provides is listed below.
-
-| Name (lexicographic order)                                                           | Maintainer
-|--------------------------------------------------------------------------------------|---------------------------
-| [acid (kernel integration tests)](https://gitlab.redox-os.org/redox-os/acid)         | **@jackpot51** **@NilSet**
-| [binutils](https://gitlab.redox-os.org/redox-os/binutils)                            | **vacant**
-| [cookbook](https://gitlab.redox-os.org/redox-os/cookbook)                            | **@jackpot51** **@ids1024** **@sajattack**
-| [coreutils](https://gitlab.redox-os.org/redox-os/coreutils)                          | **vacant**
-| [extrautils](https://gitlab.redox-os.org/redox-os/extrautils)                        | **vacant**
-| [games](https://gitlab.redox-os.org/redox-os/games)                                  | **@enrico** (AKA **@HenryTheCat**) **@fabiao**
-| [Ion (shell)](https://gitlab.redox-os.org/redox-os/ion)                              | **@mmstick** **@stratact**
-| [ipcd](https://gitlab.redox-os.org/redox-os/ipcd)                                    | **@jD91mZM2**
-| [kernel](https://gitlab.redox-os.org/redox-os/kernel)                                | **@jackpot51**
-| [libextra](https://gitlab.redox-os.org/redox-os/libextra)                            | **vacant**
-| [libpager](https://gitlab.redox-os.org/redox-os/libpager)                            | **vacant**
-| [netstack](https://gitlab.redox-os.org/redox-os/netstack)                            | **@batonius** **@dlrobertson**
-| [netutils](https://gitlab.redox-os.org/redox-os/netutils)                            | **@jackpot51**
-| [orbclient (Orbital client)](https://gitlab.redox-os.org/redox-os/orbclient)         | **@jackpot51** **@FloVanGH**
-| [orbdata](https://gitlab.redox-os.org/redox-os/orbdata)                              | **@jackpot51**
-| [orbgame (Orbital 2D game engine)](https://gitlab.redox-os.org/redox-os/orbgame)     | **@FloVanGH**
-| [Orbital (windowing and compositing system)](https://gitlab.redox-os.org/redox-os/orbital) | **@jackpot51**
-| [orbtk (Orbital toolkit)](https://gitlab.redox-os.org/redox-os/orbtk)                | **@FloVanGH**
-| [orbutils (Orbital utilities)](https://gitlab.redox-os.org/redox-os/orbutils)        | **@jackpot51**
-| [pkgutils (current package manager)](https://gitlab.redox-os.org/redox-os/pkgutils)  | **@jackpot51**
-| [ralloc](https://gitlab.redox-os.org/redox-os/ralloc)                                | **@Tommoa** **@NilSet**
-| [RANSID (Rust ANSI driver)](https://gitlab.redox-os.org/redox-os/ransid)             | **@jackpot51**
-| [redoxfs (old filesystem)](https://gitlab.redox-os.org/redox-os/redoxfs)             | **@jackpot51**
-| [relibc (C Library in Rust)](https://gitlab.redox-os.org/redox-os/relibc)            | **@jD91mZM2** **@sajattack** **@Tommoa** **@stratact**
-| [small (stack String and other collections)](https://gitlab.redox-os.org/redox-os/small) | **@Tommoa**
-| [syscall](https://gitlab.redox-os.org/redox-os/syscall)                              | **@jackpot51**
-| [Sodium (Vim-inspired text editor)](https://gitlab.redox-os.org/redox-os/sodium)     | **vacant**
-| [TFS ((ticki) **T**he **F**ile **S**ystem)](https://gitlab.redox-os.org/redox-os/tfs) | **@Tommoa**
-| [The Redox book](https://gitlab.redox-os.org/redox-os/book)                          | **vacant**
-| [userutils](https://gitlab.redox-os.org/redox-os/userutils)                          | **@jackpot51**
-
-## <a name="compile-help"> Help! Redox won't compile! </a>
-
-Sometimes things go wrong when compiling. Try the following before opening an issue:
-
-1. Run `rustup update`
-1. Run `make clean pull`.
-1. Make sure you have **the latest version of Rust nightly!** ([rustup.rs](https://www.rustup.rs) is recommended for managing Rust versions. If you already have it, run `rustup`).
-1. Update **GNU Make**, **NASM** and **QEMU/VirtualBox**.
-1. Pull the upstream master branch (`git remote add upstream git@gitlab.redox-os.org:redox-os/redox.git; git pull upstream master`).
-1. Update submodules (`git submodule update --recursive --init`).
-
-and then rebuild!
-
-## <a name="contributing"> Contributing to Redox </a>
-
-If you're interested in this project, and you'd like to help us out, [here](CONTRIBUTING.md) is a list of ways you can do just that.
-
-## <a name="cloning-building-running"> Cloning, Building and Running </a>
-
-Redox is big, even compressed. Downloading the full history may take a lot of bandwidth, and can even be costly on some data plans. Clone at your own risk!
-
-### <a name="quick-setup" /> Quick Setup </a>
-
-```bash
-$ cd path/to/your/projects/folder/
-
-# Run bootstrap setup
-$ curl -sf https://gitlab.redox-os.org/redox-os/redox/raw/master/bootstrap.sh -o bootstrap.sh && bash -e bootstrap.sh
-
-# Change to project directory
-$ cd redox
-
-# Build Redox
-$ make all
-
-# Launch using QEMU
-$ make qemu
-# Launch using QEMU without using KVM (Kernel-based Virtual Machine). Try if QEMU gives an error.
-$ make qemu kvm=no
-```
-
-#### QEMU with KVM
-
-To use QEMU with KVM (Kernel-based Virtual Machine), which is faster than without KVM, you need a CPU with Intel® Virtualization Technology (Intel® VT) or AMD Virtualization™ (AMD-V™) support. Most systems have this disabled by default, so you may need to reboot, go into the BIOS, and enable it.
-
-### <a name="manual-setup"> Manual Setup </a>
-
-To manually clone, build and run Redox using a Unix-based host, run the following commands (with exceptions, be sure to read the comments):
-```bash
-$ cd path/to/your/projects/folder/
-
-# HTTPS
-$ git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
-# SSH
-$ git clone git@gitlab.redox-os.org:redox-os/redox.git --origin upstream --recursive
-
-$ cd redox/
-
-# Install/update dependencies
-$ ./bootstrap.sh -d
-
-# Install rustup.rs
-$ curl https://sh.rustup.rs -sSf | sh
-$ source $HOME/.cargo/env
-
-# Install the sysroot manager Xargo and cargo-config
-$ cargo install xargo cargo-config
-
-# For successive builds start here. If this is your first build, just continue
-
-# Update git submodules
-$ git submodule update --recursive --init
-
-# Build Redox
-$ make all
-
-# Launch using QEMU
-$ make qemu
-
-# Launch using QEMU without using KVM (Kernel-based Virtual Machine). Try if QEMU gives an error.
-$ make qemu kvm=no
-
-# Launch using QEMU without using KVM (Kernel-based Virtual Machine) nor Graphics
-make qemu kvm=no vga=no
-```
-
-### <a name="setup-using-docker"> Setup using Docker </a>
-We also provide docker image. After cloning this repository, please follow README under the `docker` directory.
-
-### Updating the codebase using the Makefile
-To update the codebase run:
-
-```
-make pull; make fetch
-```
-
-`make pull` pulls and updates the submodules, and `make fetch` updates the sources for cookbook recipes.
+See [Redox in Action](https://www.redox-os.org/screens/) for photos and videos.

bootstrap.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 ##########################################################
 # This function is simply a banner to introduce the script
 ##########################################################
@@ -92,11 +94,15 @@ osx_macports()
 
     install_macports_pkg "git"
 
-    if [ "$1" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
         install_macports_pkg "qemu" "qemu-system-x86_64"
-    else
+	elif [ "$1" == "virtualbox" ]; then
         install_macports_pkg "virtualbox"
-    fi
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
 
     install_macports_pkg "coreutils"
     install_macports_pkg "findutils"
@@ -106,6 +112,45 @@ osx_macports()
     install_macports_pkg "osxfuse"
     install_macports_pkg "x86_64-elf-gcc"
     install_macports_pkg "cmake"
+    install_macports_pkg "ninja"
+    install_macports_pkg "po4a"
+    install_macports_pkg "findutils"
+    install_macports_pkg "texinfo"
+	install_macports_pkg "autoconf"
+	install_macports_pkg "openssl3"
+	install_macports_pkg "openssl11"
+	install_macports_pkg "bison"
+	install_macports_pkg "curl"
+	install_macports_pkg "wget"
+	install_macports_pkg "file"
+	install_macports_pkg "flex"
+	install_macports_pkg "gperf"
+	install_macports_pkg "expat"
+	install_macports_pkg "gmp"
+	install_macports_pkg "libpng"
+	install_macports_pkg "jpeg"
+	install_macports_pkg "libsdl12"
+	install_macports_pkg "libsdl2_ttf"
+	install_macports_pkg "libtool"
+	install_macports_pkg "m4"
+	install_macports_pkg "ninja"
+	install_macports_pkg "meson"
+	install_macports_pkg "python311"
+	install_macports_pkg "py37-mako"
+	install_macports_pkg "xdg-utils"
+	install_macports_pkg "zip"
+	install_macports_pkg "unzip"
+	install_macports_pkg "llvm-16"
+	install_macports_pkg "clang-16"
+	install_macports_pkg "perl5.24"
+	install_macports_pkg "p5-html-parser"
+	install_macports_pkg "doxygen"
+	install_macports_pkg "gpatch"
+	install_macports_pkg "automake"
+	install_macports_pkg "scons"
+	install_macports_pkg "gmake"
+	install_macports_pkg "lua"
+	install_macports_pkg "protobuf-c"
 }
 
 ###############################################################################
@@ -122,11 +167,15 @@ osx_homebrew()
 
     install_brew_pkg "git"
 
-    if [ "$1" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
         install_brew_pkg "qemu" "qemu-system-x86_64"
-    else
+    elif [ "$1" == "virtualbox" ]; then
         install_brew_pkg "virtualbox"
-    fi
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
 
     install_brew_pkg "automake"
     install_brew_pkg "bison"
@@ -137,7 +186,40 @@ osx_homebrew()
     install_brew_pkg "gcc@7" "gcc-7"
     install_brew_pkg "pkg-config"
     install_brew_pkg "cmake"
-    install_brew_pkg "Caskroom/cask/osxfuse"
+    install_brew_pkg "ninja"
+    install_brew_pkg "po4a"
+    install_brew_pkg "macfuse"
+    install_brew_pkg "findutils"
+    install_brew_pkg "texinfo"
+	install_brew_pkg "openssl@1.1"
+	install_brew_pkg "openssl@3.0"
+	install_brew_pkg "autoconf"
+	install_brew_pkg "curl"
+	install_brew_pkg "wget"
+	install_brew_pkg "flex"
+	install_brew_pkg "gperf"
+	install_brew_pkg "expat"
+	install_brew_pkg "gmp"
+	install_brew_pkg "libpng"
+	install_brew_pkg "jpeg"
+	install_brew_pkg "sdl12-compat"
+	install_brew_pkg "sdl2_ttf"
+	install_brew_pkg "perl"
+	install_brew_pkg "libtool"
+	install_brew_pkg "m4"
+	install_brew_pkg "ninja"
+	install_brew_pkg "meson"
+	install_brew_pkg "python@3.11"
+	install_brew_pkg "zip"
+	install_brew_pkg "unzip"
+	install_brew_pkg "llvm"
+	install_brew_pkg "doxygen"
+	install_brew_pkg "gpatch"
+	install_brew_pkg "automake"
+	install_brew_pkg "scons"
+	install_brew_pkg "lua"
+	install_brew_pkg "ant"
+	install_brew_pkg "protobuf"
 
     install_brew_pkg "redox-os/gcc_cross_compilers/x86_64-elf-gcc" "x86_64-elf-gcc"
 }
@@ -149,51 +231,135 @@ osx_homebrew()
 ###############################################################################
 freebsd()
 {
-    set -xe
+    set -x
     echo "FreeBSD detected!"
     echo "Installing missing packages..."
 
     install_freebsd_pkg "git"
 
-    if [ "$1" == "qemu" ]; then
-        install_freebsd_pkg "qemu" "qemu-system-x86_64"
-    else
-        install_freebsd_pkg "virtualbox"
-    fi
 
+	if [ "$1" == "qemu" ]; then
+        install_freebsd_pkg "qemu" "qemu-system-x86_64"
+    elif [ "$1" == "virtualbox" ]; then
+        install_freebsd_pkg "virtualbox"
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
     install_freebsd_pkg "coreutils"
     install_freebsd_pkg "findutils"
     install_freebsd_pkg "gcc"
     install_freebsd_pkg "nasm"
     install_freebsd_pkg "pkgconf"
-    install_freebsd_pkg "fusefs-libs"
+    install_freebsd_pkg "fusefs-libs3"
     install_freebsd_pkg "cmake"
     install_freebsd_pkg "gmake"
     install_freebsd_pkg "wget"
+	install_freebsd_pkg "openssl"
     install_freebsd_pkg "texinfo"
     install_freebsd_pkg "python"
     install_freebsd_pkg "automake"
     install_freebsd_pkg "gettext"
     install_freebsd_pkg "bison"
     install_freebsd_pkg "gperf"
-    set +xe
+	install_freebsd_pkg "autoconf"
+	install_freebsd_pkg "curl"
+	install_freebsd_pkg "file"
+	install_freebsd_pkg "flex"
+	install_freebsd_pkg "expat2"
+	install_freebsd_pkg "gmp"
+	install_freebsd_pkg "png"
+	install_freebsd_pkg "libjpeg-turbo"
+	install_freebsd_pkg "sdl12"
+	install_freebsd_pkg "sdl2_ttf"
+	install_freebsd_pkg "perl5.36"
+	install_freebsd_pkg "p5-HTML-Parser"
+	install_freebsd_pkg "libtool"
+	install_freebsd_pkg "m4"
+	install_freebsd_pkg "po4a"
+	install_freebsd_pkg "syslinux"
+	install_freebsd_pkg "ninja"
+	install_freebsd_pkg "meson"
+	install_freebsd_pkg "xdg-utils"
+	install_freebsd_pkg "zip"
+	install_freebsd_pkg "unzip"
+	install_freebsd_pkg "llvm"
+	install_freebsd_pkg "doxygen"
+	install_freebsd_pkg "patch"
+	install_freebsd_pkg "automake"
+	install_freebsd_pkg "scons"
+	install_freebsd_pkg "lua54"
+	install_freebsd_pkg "py-protobuf-compiler"
+    set +x
 }
 
 ###############################################################################
 # This function takes care of installing all dependencies for building Redox on
 # Arch Linux
 # @params:	$1 the emulator to install, "virtualbox" or "qemu"
+# 		$2 install non-interactively, boolean
 ###############################################################################
 archLinux()
 {
+	noninteractive=$2
+
+	pacman_install="pacman -S --needed"
+	if [ "$noninteractive" = true ]; then
+		pacman_install+="  --noconfirm"
+	fi
+
 	echo "Detected Arch Linux"
-	packages="cmake fuse git gperf perl-html-parser nasm wget texinfo bison flex po4a"
+	packages="cmake \
+	fuse \
+	git \
+	gperf \
+	perl-html-parser \
+	nasm \
+	wget \
+	texinfo \
+	bison \
+	flex \
+	po4a \
+	autoconf \
+	curl \
+	file \
+	patch \
+	automake \
+	scons \
+	waf \
+	expat \
+	gmp \
+	libtool \
+	libpng \
+	libjpeg-turbo \
+	sdl12-compat \
+	m4 \
+	pkgconf \
+	po4a \
+	syslinux \
+	meson \
+	python \
+	python-mako \
+	make \
+	xdg-utils \
+	zip \
+	unzip \
+	llvm \
+	clang \
+	perl \
+	doxygen \
+	lua \
+	ant \
+	protobuf"
+
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
 		packages="$packages virtualbox"
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
-
 	# Scripts should not cause a system update in order to just install a couple
 	#   of packages. If pacman -S --needed is going to fail, let it fail and the
 	#   user will figure out the issues (without updating if required) and rerun
@@ -202,65 +368,121 @@ archLinux()
 	#sudo pacman -Syu
 
 	echo "Installing packages $packages..."
-	sudo pacman -S --needed $packages
+	sudo $pacman_install $packages
 }
 
 ###############################################################################
 # This function takes care of installing all dependencies for building Redox on
 # Debian-based Linux
 # @params:	$1 the emulator to install, "virtualbox" or "qemu"
-# 		$2 the package manager to use
+# 		$2 install non-interactively, boolean
+#		$3 the package manager to use
 ###############################################################################
 ubuntu()
 {
+	noninteractive=$2
+	package_manager=$3
 	echo "Detected Ubuntu/Debian"
 	echo "Updating system..."
-	sudo "$2" update
+	sudo $package_manager update
+
+	if [ $package_manager == "apt-get" ]; then
+		if [ "$noninteractive" = true ]; then
+			install_command+="DEBIAN_FRONTEND=noninteractive apt-get install --assume-yes --quiet"
+		else
+			install_command="apt-get install"
+		fi
+	else
+		install_command="$package_manager install"
+	fi
+
 	echo "Installing required packages..."
-	sudo "$2" install \
+	pkgs="\
+		ant \
 		autoconf \
+		automake \
 		autopoint \
 		bison \
 		build-essential \
+		clang \
 		cmake \
 		curl \
+		dos2unix \
+		doxygen \
 		file \
 		flex \
+		fuse3 \
+		g++ \
 		genisoimage \
 		git \
 		gperf \
-		libc6-dev-i386 \
+		intltool \
 		libexpat-dev \
 		libfuse-dev \
 		libgmp-dev \
 		libhtml-parser-perl \
+		libjpeg-dev \
+		libmpfr-dev \
 		libpng-dev \
+		libsdl1.2-dev \
+		libsdl2-ttf-dev \
 		libtool \
+		llvm \
+		lua5.4 \
 		m4 \
+		make \
+		meson \
 		nasm \
+		ninja-build \
+		patch \
+		perl \
 		pkg-config \
 		po4a \
-		syslinux-utils \
+		protobuf-compiler \
+		python3 \
+		python3-mako \
+		rsync \
+		scons \
 		texinfo \
-		libsdl1.2-dev \
-		ninja-build \
-		meson \
-		python3-mako
+		unzip \
+		wget \
+		xdg-utils \
+		xxd \
+		zip \
+		zstd \
+		"
+	# Not availible for at least ARM hosts
+	case "$host_arch" in
+		x86*|i?86) pkgs="$pkgs libc6-dev-i386 syslinux-utils";;
+	esac
+	sudo $install_command $pkgs
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Installing QEMU..."
-			sudo "$2" install qemu-system-x86 qemu-kvm
-			sudo "$2" install qemu-efi-arm qemu-system-arm
+			sudo $install_command qemu-system-x86 qemu-kvm
+			sudo $install_command qemu-efi-arm qemu-system-arm
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Installing VirtualBox..."
-			sudo "$2" install virtualbox
+
+			if grep '^ID=debian$' /etc/os-release > /dev/null; then
+				echo "Virtualbox is not in the official debian packages"
+				echo "To install virtualbox on debian, see https://wiki.debian.org/VirtualBox"
+				echo "Please install VirtualBox and re-run this script,"
+				echo "or run with -e qemu"
+			exit 1
+			else
+				echo "Installing VirtualBox..."
+				sudo $install_command virtualbox
+			fi
 		else
 			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
 }
 
@@ -268,69 +490,234 @@ ubuntu()
 # This function takes care of installing all dependencies for building Redox on
 # Fedora Linux
 # @params:	$1 the emulator to install, "virtualbox" or "qemu"
+# 		$2 install non-interactively, boolean
 ###############################################################################
 fedora()
 {
+	noninteractive=$2
+
+	dnf_install="dnf install"
+	if [ "$noninteractive" = true ]; then
+		dnf_install+=" --assumeyes --quiet"
+	fi
+
 	echo "Detected Fedora"
 	if [ -z "$(which git)" ]; then
 		echo "Installing git..."
-		sudo dnf install git-all
+		sudo $dnf_install git-all
 	fi
+
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Installing QEMU..."
-			sudo dnf install qemu-system-x86 qemu-kvm
+			sudo $dnf_install qemu-system-x86 qemu-kvm
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Installing VirtualBox..."
-			sudo dnf install virtualbox
+			echo "Please install VirtualBox and re-run this script,"
+			echo "or run with -e qemu"
+			exit 1
 		else
 			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+		
 	# Use rpm -q <package> to check if it's already installed
-	PKGS=$(for pkg in gcc gcc-c++ glibc-devel.i686 nasm make fuse-devel cmake texinfo gettext-devel bison flex perl-HTML-Parser po4a openssl patch automake libtool perl-Pod-Html perl-FindBin gperf libpng-devel; do rpm -q $pkg > /dev/null || echo $pkg; done)
+	PKGS=$(for pkg in file \
+	autoconf \
+	vim \
+	bison \
+	flex \
+	genisoimage \
+	gperf \
+	glibc-devel.i686 \
+	expat \
+	expat-devel \
+	fuse-devel \
+	fuse3-devel \
+	gmp-devel \
+	libpng-devel \
+	perl \
+	perl-HTML-Parser \
+	libtool \
+	libjpeg-turbo-devel \
+	SDL2_ttf-devel \
+	sdl12-compat-devel \
+	m4 \
+	nasm \
+	po4a \
+	syslinux \
+	texinfo \
+	ninja-build \
+	meson \
+	waf \
+	python3-mako \
+	make \
+	gcc \
+	gcc-c++ \
+	openssl \
+	patch \
+	automake \
+	perl-Pod-Html \
+	perl-FindBin \
+	gperf \
+	curl \
+	gettext-devel \
+	perl-Pod-Xhtml \
+	pkgconf-pkg-config \
+	cmake \
+	llvm \
+	zip \
+	unzip \
+	lua \
+	luajit \
+	make \
+	clang \
+	doxygen \
+	ant \
+	protobuf-compiler \
+	zstd ; do rpm -q $pkg > /dev/null || echo $pkg; done)
 	# If the list of packages is not empty, install missing
 	COUNT=$(echo $PKGS | wc -w)
 	if [ $COUNT -ne 0 ]; then
 					echo "Installing necessary build tools..."
-					sudo dnf install $PKGS
+					sudo $dnf_install $PKGS
 	fi
 }
 
 ###############################################################################
 # This function takes care of installing all dependencies for building Redox on
 # *SUSE Linux
-# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 suse()
 {
 	echo "Detected SUSE Linux"
+
+	packages=(
+		"gcc"
+		"gcc-c++"
+		"glibc-devel-32bit"
+		"nasm"
+		"make"
+		"fuse-devel"
+		"cmake"
+		"openssl"
+		"automake"
+		"gettext-tools"
+		"libtool"
+		"po4a"
+		"patch"
+		"flex"
+		"gperf"
+		"autoconf"
+		"bison"
+		"curl"
+		"wget"
+		"file"
+		"libexpat-devel"
+		"gmp-devel"
+		"libpng16-devel"
+		"libjpeg8-devel"
+		"perl"
+		"perl-HTML-Parser"
+		"m4"
+		"patch"
+		"scons"
+		"pkgconf"
+		"syslinux-utils"
+		"ninja"
+		"meson"
+		"python-Mako"
+		"xdg-utils"
+		"zip"
+		"unzip"
+		"llvm"
+		"clang"
+		"doxygen"
+		"lua54"
+		"ant"
+		"protobuf"
+	)
+
 	if [ -z "$(which git)" ]; then
-		echo "Installing git..."
-		zypper install git
+		echo "Will install git ..."
+		packages+=(git)
 	fi
+
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
-			echo "Installing QEMU..."
-			sudo zypper install qemu-x86 qemu-kvm
+			echo "Will install QEMU..."
+			packages+=(qemu-x86 qemu-kvm)
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
 			echo "Please install VirtualBox and re-run this script,"
 			echo "or run with -e qemu"
-			exit
+			exit 1
 		else
 			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+	
 	echo "Installing necessary build tools..."
-	sudo zypper install gcc gcc-c++ glibc-devel-32bit nasm make fuse-devel cmake openssl automake gettext-tools libtool po4a patch flex gperf
+
+	# We could install all the packages in a single zypper command with:
+	#
+	#        zypper install package1 package2 package3
+	# 
+	# But there is an issue with this: zypper returns a success code if at
+	# least one of the packages was correctly installed, but we need it to fail
+	# if any of the packages is missing.
+	#
+	# To confirm that the packages are available, we try to install them one by
+	# one with --dry-run.
+	# We still install all the packages in a single zypper command so that the
+	# user has to confirm only once.
+	for p in ${packages[@]}; do
+		if rpm -q "${p}" > /dev/null ; then
+		   echo "${p} is already installed"
+		else
+		   # Zypper shows a confirmation prompt and the "y" answer even with 
+		   # --non-interactive and --no-confirm:
+		   #
+		   #   1 new package to install.
+           #   Overall download size: 281.7 KiB. Already cached: 0 B. After the operation, additional 394.6 KiB will be used.
+           #   Continue? [y/n/v/...? shows all options] (y): y
+		   #
+		   # That could make the user think that the package was installed, 
+		   # when it was only a dry run.
+		   # To avoid the confusion, we hide the output unless there was an
+		   # error.
+		   if out="$(zypper --non-interactive install --no-confirm --dry-run --force-resolution ${p}  2>&1)"  ; then
+		      echo "${p} can be installed"
+		   else
+		   	  echo "no"
+			  echo ""
+		      echo "Zypper output:"
+			  echo ""
+			  echo "${out}"
+			  echo ""
+		      echo "Could not find how to install '${p}', try running:"
+			  echo ""
+			  echo "     zypper install ${p}"
+			  echo ""
+			  exit 1
+		   fi
+		fi
+	done
+
+	zypper install ${packages[@]}
+
 }
 
 ##############################################################################
@@ -349,23 +736,40 @@ gentoo()
 		echo "Installing git..."
 		sudo emerge dev-vcs/git
 	fi
-	if [ -z "$(which fusermount)" ]; then
+	if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
 		echo "Installing fuse..."
 		sudo emerge sys-fs/fuse
 	fi
-	if [ "$2" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Please install QEMU and re-run this script"
 			echo "Step1. Add QEMU_SOFTMMU_TARGETS=\"x86_64\" to /etc/portage/make.conf"
 			echo "Step2. Execute \"sudo emerge app-emulation/qemu\""
+            exit 1
 		else
 			echo "QEMU already installed!"
 		fi
+	elif [ "$1" == "virtualbox" ]; then
+		if [ -z "$(which virtualbox)" ]; then
+			echo "Please install VirtualBox and re-run this script,"
+			echo "or run with -e qemu"
+			exit 1
+		else
+			echo "VirtualBox already installed!"
+		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+
 	if [ -z "$(which cmake)" ]; then
 		echo "Installing cmake..."
 		sudo emerge dev-util/cmake
 	fi
+	if [ -z "$(ldconfig -p | grep fontconfig)" ]; then
+		sudo emerge media-libs/fontconfig
+	fi
 }
 
 ##############################################################################
@@ -383,19 +787,47 @@ solus()
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
 			echo "Please install VirtualBox and re-run this script,"
 			echo "or run with -e qemu"
-			exit
+			exit 1
 		else
 			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
 
 	echo "Installing necessary build tools..."
 	#if guards are not necessary with eopkg since it does nothing if latest version is already installed
-	sudo eopkg it fuse-devel git gcc g++ libgcc-32bit libstdc++-32bit nasm make cmake binutils-gold glibc-devel pkg-config fuse2-devel linux-headers rsync automake autoconf m4 libtool-devel po4a patch bison flex gperf libpng-devel perl-html-parser
+	sudo eopkg it fuse-devel \
+	git \
+	gcc \
+	g++ \
+	libgcc-32bit \
+	libstdc++-32bit \
+	nasm \
+	make \
+	cmake \
+	binutils-gold \
+	glibc-devel \
+	pkg-config \
+	fuse2-devel \
+	linux-headers \
+	rsync \
+	automake \
+	autoconf \
+	m4 \
+	libtool-devel \
+	po4a \
+	patch \
+	bison \
+	flex \
+	gperf \
+	libpng-devel \
+	perl-html-parser
 }
 
 ######################################################################
@@ -417,6 +849,10 @@ usage()
 	echo "   -p [package    Choose an Ubuntu package manager, apt-fast or"
 	echo "       manager]   aptitude"
 	echo "   -d             Only install the dependencies, skip boot step"
+	echo "   -y             Install non-interactively. Answer \"yes\" or"
+	echo "                  select the default option for rustup and package"
+	echo "					managers. Only the apt, dnf and pacman"
+	echo "                  package managers are supported."
 	echo "EXAMPLES:"
 	echo
 	echo "./bootstrap.sh -e qemu"
@@ -439,8 +875,10 @@ cargoInstall() {
 # This function takes care of everything associated to rust, and the version manager
 # That controls it, it can install rustup and uninstall multirust as well as making
 # sure that the correct version of rustc is selected by rustup
+# @params:	$1 install non-interactively, boolean
 ####################################################################################
 rustInstall() {
+	noninteractive=$1
 	# Check to see if multirust is installed, we don't want it messing with rustup
 	# In the future we can probably remove this but I believe it's good to have for now
 	if [ -e /usr/local/lib/rustlib/uninstall.sh ] ; then
@@ -453,20 +891,26 @@ rustInstall() {
 			sudo /usr/local/lib/rustlib/uninstall.sh
 		else
 			echo "Please manually uninstall multirust and any other versions of rust, then re-run bootstrap."
-			exit
+			exit 1
 		fi
 	fi
 	# If rustup is not installed we should offer to install it for them
 	if [ -z "$(which rustup)" ]; then
+        rustup_options="--default-toolchain nightly"
 		echo "You do not have rustup installed."
-		echo "We HIGHLY recommend using rustup."
-		echo "Would you like to install it now?"
-		echo "*WARNING* this involves a 'curl | sh' style command"
-		printf "(y/N): "
-		read rustup
+		if [ "$noninteractive" = true ]; then
+		   rustup="y"
+		   rustup_options+=" -y"
+		else
+			echo "We HIGHLY recommend using rustup."
+			echo "Would you like to install it now?"
+			echo "*WARNING* this involves a 'curl | sh' style command"
+			printf "(y/N): "
+			read rustup
+		fi
 		if echo "$rustup" | grep -iq "^y" ;then
 			#install rustup
-			curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly
+			curl https://sh.rustup.rs -sSf | sh -s -- $rustup_options
 			# You have to add the rustup variables to the $PATH
 			echo "export PATH=\"\$HOME/.cargo/bin:\$PATH\"" >> ~/.bashrc
 			# source the variables so that we can execute rustup commands in the current shell
@@ -481,7 +925,7 @@ rustInstall() {
 		echo "Please either run the script again, accepting rustup install"
 		echo "or install rustc nightly manually (not recommended) via:"
 		echo "\#curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly"
-		exit
+		exit 1
 	else
 		echo "Your Rust install looks good!"
 	fi
@@ -561,11 +1005,14 @@ elif [ "$1" == "-s" ]; then
 	exit
 fi
 
+host_arch=$(uname -m)
 emulator="qemu"
 defpackman="apt-get"
 dependenciesonly=false
 update=false
-while getopts ":e:p:udhs" opt
+noninteractive=false
+
+while getopts ":e:p:udhys" opt
 do
 	case "$opt" in
 		e) emulator="$OPTARG";;
@@ -573,14 +1020,15 @@ do
 		d) dependenciesonly=true;;
 		u) update=true;;
 		h) usage;;
+		y) noninteractive=true;;
 		s) statusCheck && exit;;
-		\?) echo "I don't know what to do with that option, try -h for help"; exit;;
+		\?) echo "I don't know what to do with that option, try -h for help"; exit 1;;
 	esac
 done
 
 banner
 
-rustInstall
+rustInstall "$noninteractive"
 
 if [ "$update" == "true" ]; then
 	git pull upstream master
@@ -599,10 +1047,10 @@ else
 		suse "$emulator"
 	# Debian or any derivative of it
 	elif hash 2>/dev/null apt-get; then
-		ubuntu "$emulator" "$defpackman"
+		ubuntu "$emulator" "$noninteractive" "$defpackman"
 	# Fedora
 	elif hash 2>/dev/null dnf; then
-		fedora "$emulator"
+		fedora "$emulator" "$noninteractive"
 	# Gentoo
 	elif hash 2>/dev/null emerge; then
 		gentoo "$emulator"
@@ -611,7 +1059,7 @@ else
 		solus "$emulator"
 	# Arch Linux
 	elif hash 2>/dev/null pacman; then
-		archLinux "$emulator"
+		archLinux "$emulator" "$noninteractive"
 	# FreeBSD
 	elif hash 2>/dev/null pkg; then
 		freebsd "$emulator"
@@ -622,7 +1070,8 @@ else
 fi
 
 cargoInstall cargo-config 0.1.1
-cargoInstall xargo 0.3.20
+cargoInstall just 1.16.0
+cargoInstall cbindgen 0.26.0
 
 if [ "$dependenciesonly" = false ]; then
 	boot

config/aarch64/acid.toml

@@ -0,0 +1,3 @@
+# Configuration for using acid
+
+include = ["../acid.toml"]

config/aarch64/ci.toml

@@ -0,0 +1,213 @@
+# This is the CI configuration file
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+acid = {}
+atk = {}
+audiod = {}
+autoconf = {}
+automake = {}
+bash = {}
+binutils = {}
+bootloader = {}
+bootstrap = {}
+ca-certificates = {}
+cairo = {}
+cairodemo = {}
+#calculator = {}
+cargo = {}
+cleye = {}
+#cmatrix = {} # needs ncursesw now
+contain = {}
+coreutils = {}
+cosmic-edit = {}
+cosmic-icons = {}
+cosmic-text = {}
+cpal = {}
+curl = {}
+dash = {}
+diffutils = {}
+dosbox = {}
+drivers = {}
+drivers-initfs = {}
+duktape = {}
+eduke32 = {}
+escalated = {}
+exampled = {}
+expat = {}
+extrautils = {}
+#fal
+#fd = {} # ctrlc-3.1.1
+#ffmpeg6 = {} # undefined references
+findutils = {}
+fontconfig = {}
+#freeciv = {}
+freedoom = {}
+#freeglut = {}
+freepats = {}
+freetype2 = {}
+#friar = {} # mio patch
+fribidi = {}
+#game-2048 = {} # rustc-serialize
+#gawk = {} # langinfo.h
+gcc13 = {}
+gdbserver = {}
+#gdk-pixbuf = {} # shared-mime-info
+gears = {}
+generaluser-gs = {}
+gettext = {}
+gigalomania = {}
+git = {}
+glib = {}
+glium = {}
+glutin = {}
+gnu-binutils = {}
+gnu-grep = {}
+gnu-make = {}
+#gstreamer = {} # conflict with thread local errno
+harfbuzz = {}
+#hematite = {} # needs crate patches for redox-unix
+init = {}
+initfs = {}
+installer = {}
+installer-gui = {}
+intel-one-mono = {}
+ion = {}
+ipcd = {}
+jansson = {}
+kernel = {}
+keyboard-sfx = {}
+lci = {}
+libc-bench = {}
+libffi = {}
+libgmp = {}
+libiconv = {}
+libjpeg = {}
+libogg = {}
+liborbital = {}
+libpng = {}
+libsodium = {}
+libvorbis = {}
+libxml2 = {}
+llvm = {}
+logd = {}
+lua54 = {}
+#mdp = {} # ncursesw
+mesa = {}
+mesa-glu = {}
+mgba = {}
+#miniserve = {} # actix
+nano = {}
+nasm = {}
+#ncdu = {} # fails to link with ncurses
+ncurses = {}
+#ncursesw = {} # mkstemp configure hang
+netdb = {}
+netstack = {}
+netsurf = {}
+netutils = {}
+neverball = {}
+#newlib = {} # obsolete
+#newlibtest = {} # obsolete
+nghttp2 = {}
+openjazz = {}
+openssl1 = {}
+openttd = {}
+openttd-opengfx = {}
+openttd-openmsx = {}
+openttd-opensfx = {}
+orbclient = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+#orbutils-background = {} # needs recipe update
+#orbutils-launcher = {} # needs recipe update
+#orbutils-orblogin = {} # needs recipe update
+osdemo = {}
+#pango = {} # undefined references to std::__throw_system_error(int)
+#pastel = {} # needs crate patches for redox-unix
+patch = {}
+#pathfinder = {} # servo-fontconfig
+#pciids = {}
+pcre = {}
+perg = {}
+periodictable = {}
+#perl = {} # ctermid, tempnam, ttyname
+pixelcannon = {}
+pixman = {}
+#pkgar = {} # uses virtual Cargo.toml, needs recipe update
+pkg-config = {}
+pkgutils = {}
+pop-icon-theme = {}
+#powerline = {} # dirs
+prboom = {}
+procedural-wallpapers-rs = {}
+ptyd = {}
+#python = {} # getaddrinfo
+#qemu = {}
+ramfs = {}
+randd = {}
+readline = {}
+redoxerd = {}
+redox-fatfs = {}
+redoxfs = {}
+redox-games = {}
+redox-ssh = {}
+relibc = {}
+#relibc-tests = {} # madvise link error
+resist = {}
+#retroarch = {} # OS_TLSIndex not declared
+ripgrep = {}
+rodioplay = {}
+rs-nes = {}
+rust = {}
+rust64 = {}
+rust-cairo = {}
+rust-cairo-demo = {}
+rustual-boy = {}
+schismtracker = {}
+scummvm = {}
+sdl-gfx = {}
+#sdl-player = {} # wctype_t
+sdl1 = {}
+sdl1-image = {}
+sdl1-mixer = {}
+sdl1-ttf = {}
+sdl2 = {}
+sdl2-gears = {}
+sdl2-image = {}
+sdl2-mixer = {}
+sdl2-ttf = {}
+sed = {}
+#servo = {} # some more crates to port
+#shared-mime-info = {} # intltool-update out of date
+shellharden = {}
+shellstorm = {}
+smith = {}
+sodium = {}
+sopwith = {}
+#ssh = {}
+strace = {}
+syobonaction = {}
+terminfo = {}
+#termplay = {} # backtrace cannot find link.h
+timidity = {}
+ttf-hack = {}
+userutils = {}
+uutils = {}
+vice = {}
+vim = {}
+vttest = {}
+vvvvvv = {}
+#webrender = {} # unwind
+#wesnoth = {}
+#winit = {} # tzset
+xz = {}
+zerod = {}
+zlib = {}

config/aarch64/desktop-minimal.toml

@@ -0,0 +1,14 @@
+# Default desktop configuration
+
+include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/aarch64/desktop.toml

@@ -1,191 +0,0 @@
-# Default desktop configuration
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-#drivers = {} # more porting work
-#escalated = {} # porting
-extrautils = {}
-findutils = {}
-initfs = {}
-#installer = {} # failure to build ring
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-#netsurf = {} # lots of porting issues
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-#pkgutils = {} # failure to build ring
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true

config/aarch64/raspi3bp/server-minimal.toml

@@ -0,0 +1,10 @@
+# Minimal configuration
+
+include = ["../../server-minimal.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 256
+# EFI partition size in MiB
+efi_partition_size = 128

config/aarch64/resist.toml

@@ -0,0 +1,3 @@
+# Configuration for using resist
+
+include = ["../resist.toml"]

config/aarch64/server-minimal.toml

@@ -0,0 +1,14 @@
+# Minimal configuration
+
+include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/acid.toml

@@ -0,0 +1,26 @@
+# Configuration for using acid
+
+include = ["base.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 256
+
+# Package settings
+[packages]
+acid = {}
+coreutils = {}
+ion = {}
+
+[[files]]
+path = "/usr/lib/init.d/10_acid"
+data = """
+export RUST_BACKTRACE full
+acid
+acid create_test
+acid switch
+acid tls
+acid thread
+shutdown
+"""

config/base.toml

@@ -0,0 +1,168 @@
+# Base configuration: This configuration is meant to be included by
+# other configurations rather than use directly. It is the greatest
+# common divisor of all other configurations and misses several
+# parts necessary to create a bootable system.
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+[packages]
+bootloader = {}
+bootstrap = {}
+escalated = {}
+initfs = {}
+ipcd = {}
+kernel = {}
+ptyd = {}
+uutils = {}
+
+## Configuration files
+[[files]]
+path = "/usr/lib/init.d/00_base"
+data = """
+# clear and recreate tmpdir with 0o1777 permission
+rm -r /tmp
+mkdir -m a=rwxt /tmp
+
+ipcd
+ptyd
+escalated
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+# https://www.freedesktop.org/software/systemd/man/latest/os-release.html
+[[files]]
+path = "/usr/lib/os-release"
+data = """
+PRETTY_NAME="Redox OS 0.8.0"
+NAME="Redox OS"
+VERSION_ID="0.8.0"
+VERSION="0.8.0"
+ID="redox-os"
+
+HOME_URL="https://redox-os.org/"
+DOCUMENTATION_URL="https://redox-os.org/docs/"
+SUPPORT_URL="https://redox-os.org/community/"
+"""
+# FIXME maybe add VARIANT= and VARIANT_ID= keys depending on the chosen configuration?
+
+[[files]]
+path = "/etc/os-release"
+data = "../usr/lib/os-release"
+symlink = true
+
+## Symlinks for usrmerge
+[[files]]
+path = "/usr"
+data = ""
+directory = true
+mode = 0o755
+
+[[files]]
+path = "/usr/bin"
+data = ""
+directory = true
+mode = 0o755
+
+[[files]]
+path = "/bin"
+data = "usr/bin"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = ""
+directory = true
+mode = 0o755
+
+[[files]]
+path = "/include"
+data = "usr/include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = ""
+directory = true
+mode = 0o755
+
+[[files]]
+path = "/lib"
+data = "usr/lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = ""
+directory = true
+mode = 0o755
+
+[[files]]
+path = "/share"
+data = "usr/share"
+symlink = true
+
+## Device file symlinks
+[[files]]
+path = "/dev/null"
+data = "null:"
+symlink = true
+
+[[files]]
+path = "/dev/random"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/urandom"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/zero"
+data = "zero:"
+symlink = true
+
+[[files]]
+path = "/dev/tty"
+data = "libc:tty"
+symlink = true
+
+[[files]]
+path = "/dev/stdin"
+data = "libc:stdin"
+symlink = true
+
+[[files]]
+path = "/dev/stdout"
+data = "libc:stdout"
+symlink = true
+
+[[files]]
+path = "/dev/stderr"
+data = "libc:stderr"
+symlink = true
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+# Group settings
+[groups.sudo]
+gid = 1
+members = ["user"]

config/desktop-minimal.toml

@@ -0,0 +1,30 @@
+# Default desktop configuration
+
+include = ["server-minimal.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 128
+
+# Package settings
+[packages]
+drivers = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils-background = {}
+orbutils-launcher = {}
+orbutils-orblogin = {}
+
+[[files]]
+path = "/usr/lib/init.d/00_drivers"
+data = """
+pcid /etc/pcid.d/
+"""
+
+[[files]]
+path = "/usr/lib/init.d/20_orbital"
+data = """
+orbital orblogin launcher
+"""

config/desktop.toml

@@ -0,0 +1,33 @@
+# Default desktop configuration
+
+include = ["server.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 512
+
+# Package settings
+[packages]
+audiod = {}
+installer-gui = {}
+netsurf = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+
+[[files]]
+path = "/usr/lib/init.d/20_orbital"
+data = """
+audiod
+orbital orblogin launcher
+"""
+
+# Override console config to not switch to VT 2
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+getty 2
+getty debug: -J
+"""

config/dev.toml

@@ -0,0 +1,27 @@
+# Configuration for development, includes cargo and rustc
+
+include = ["desktop.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 2048
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+cargo = {}
+crates-io-index = {}
+gcc13 = {}
+gnu-binutils = {}
+gnu-make = {}
+rust = {}
+
+[[files]]
+path = "/home/user/example.rs"
+data = """
+fn main() {
+    println!("Hello, Redox!");
+}
+"""

config/i686/acid.toml

@@ -0,0 +1,3 @@
+# Configuration for using acid
+
+include = ["../acid.toml"]

config/i686/ci.toml

@@ -13,7 +13,7 @@ bootstrap = {}
 ca-certificates = {}
 contain = {}
 coreutils = {}
-#dash = {} # relibc issues?
+dash = {}
 diffutils = {}
 drivers = {}
 escalated = {}
@@ -21,12 +21,14 @@ extrautils = {}
 findutils = {}
 initfs = {}
 installer = {}
+installer-gui = {}
 ion = {}
 ipcd = {}
 kernel = {}
+nano = {}
 netdb = {}
 netstack = {}
-#netsurf = {} # openssl issues
+netsurf = {}
 netutils = {}
 orbdata = {}
 orbital = {}
@@ -40,5 +42,6 @@ resist = {}
 smith = {}
 userutils = {}
 uutils = {}
+vim = {}
 
 #TODO: Add more packages

config/i686/demo.toml

@@ -22,197 +22,26 @@
 #                                                                            #
 ##############################################################################
 
+include = ["../desktop.toml"]
+
 # General settings
 [general]
 # Filesystem size in MiB
 filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-#dash = {} # relibc issues?
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-#netsurf = {} # openssl issues
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
+# Games
+dosbox = {}
+freedoom = {}
+prboom = {}
+redox-games = {}
 
-#TODO: Add demos
+# Demos
+pixelcannon = {}
 
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# MIDI
+freepats = {}
 
 [[files]]
 path = "/home/user/Welcome.txt"

config/i686/desktop-minimal.toml

@@ -1,132 +1,14 @@
 # Default desktop configuration
 
+include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-bootstrap = {}
-coreutils = {}
-escalated = {}
-extrautils = {}
-initfs = {}
-ion = {}
-ipcd = {}
-kernel = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
-ptyd = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/i686/desktop.toml

@@ -1,191 +1,14 @@
 # Default desktop configuration
 
+include = ["../desktop.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-#dash = {} # relibc issues?
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-#netsurf = {} # openssl issues
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/i686/dev.toml

@@ -0,0 +1,14 @@
+# Configuration for development, includes cargo and rustc
+
+include = ["../dev.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/i686/jeremy.toml

@@ -1,48 +1,14 @@
 # Jeremy's configuration
 
+include = ["../desktop.toml"]
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 512
-# Do not prompt if settings are not defined
-prompt = false
+filesystem_size = 4000
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-#dash = {} # relibc issues?
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-#netsurf = {} # openssl issues
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
 # apps
 cosmic-text = {}
 pixelcannon = {}
@@ -60,184 +26,15 @@ rodioplay = {}
 winit = {}
 
 # games
-games = {}
+dosbox = {}
+eduke32 = {}
+freedoom = {}
+prboom = {}
+redox-games = {}
 
 # stuff
+freepats = {}
 generaluser-gs = {}
 jeremy = {}
 keyboard-sfx = {}
-terminfo = {}
 ttf-hack = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
-
-[[files]]
-path = "/home/user/Welcome.txt"
-data = """
-##############################################################################
-#                                                                            #
-#                             Welcome to Redox!                              #
-#                                                                            #
-# Redox is an operating system written in Rust, a language with focus        #
-# on safety and high performance. Redox, following the microkernel design,   #
-# aims to be secure, usable, and free. Redox is inspired by previous kernels #
-# and operating systems, such as SeL4, MINIX, Plan 9, and BSD.               #
-#                                                                            #
-# Redox _is not_ just a kernel, it's a full-featured Operating System,       #
-# providing packages (memory allocator, file system, display manager, core   #
-# utilities, etc.) that together make up a functional and convenient         #
-# operating system. You can loosely think of it as the GNU or BSD ecosystem, #
-# but in a memory safe language and with modern technology.                  #
-#                                                                            #
-# The website can be found at https://www.redox-os.org.                      #
-#                                                                            #
-# For things to try on Redox, please see                                     #
-# https://doc.redox-os.org/book/ch02-06-trying-out-redox.html                #
-#                                                                            #
-##############################################################################
-"""

config/i686/resist.toml

@@ -0,0 +1,3 @@
+# Configuration for using resist
+
+include = ["../resist.toml"]

config/i686/server-minimal.toml

@@ -1,120 +1,14 @@
 # Minimal configuration
 
+include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 64
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-bootstrap = {}
-coreutils = {}
-escalated = {}
-extrautils = {}
-initfs = {}
-ion = {}
-ipcd = {}
-kernel = {}
-ptyd = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2/activate
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/i686/server.toml

@@ -1,177 +1,14 @@
 # Default server configuration
 
+include = ["../server.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 128
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-#dash = {} # relibc issues?
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2/activate
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/net.toml

@@ -0,0 +1,51 @@
+# Net configuration: includes the base configuration and adds files required
+# for networking
+
+include = ["base.toml"]
+
+# Package settings
+[packages]
+drivers = {}
+netstack = {}
+netutils = {}
+
+## Driver init
+[[files]]
+path = "/usr/lib/init.d/00_drivers"
+data = """
+pcid /etc/pcid.d/
+"""
+
+## Network init
+[[files]]
+path = "/usr/lib/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+## Default net configuration (optimized for QEMU)
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""

config/redoxer-gui.toml

@@ -0,0 +1,17 @@
+# Configuration for redoxer GUI image
+
+include = ["redoxer.toml"]
+
+# Package settings
+[packages]
+orbdata = {}
+orbital = {}
+
+# Override to run inside of orbital
+[[files]]
+path = "/usr/lib/init.d/30_redoxer"
+data = """
+echo
+echo ## running redoxer in orbital ##
+orbital redoxerd
+"""

config/redoxer.toml

@@ -0,0 +1,53 @@
+# Configuration for redoxer image
+
+include = ["net.toml"]
+
+# Package settings
+[packages]
+bash = {}
+ca-certificates = {}
+coreutils = {}
+extrautils = {}
+findutils = {}
+gcc13 = {}
+gnu-binutils = {}
+netdb = {}
+pkgutils = {}
+redoxerd = {}
+relibc = {}
+
+# Override to not background dhcpd
+[[files]]
+path = "/usr/lib/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd
+"""
+
+[[files]]
+path = "/usr/lib/init.d/20_env"
+data = """
+echo
+echo ## preparing environment ##
+export GROUPS 0
+export HOME /root
+export HOST redox
+export SHELL /bin/sh
+export UID 0
+export USER root
+cd /root
+env
+"""
+
+[[files]]
+path = "/usr/lib/init.d/30_redoxer"
+data = """
+echo
+echo ## running redoxer ##
+redoxerd
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"

config/resist.toml

@@ -0,0 +1,45 @@
+# Configuration for using resist
+
+include = ["net.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 256
+
+# Package settings
+[packages]
+bash = {}
+coreutils = {}
+diffutils = {}
+extrautils = {}
+findutils = {}
+gcc13 = {}
+gnu-binutils = {}
+gnu-make = {}
+netdb = {}
+resist = {}
+userutils = {}
+
+# Override to not background dhcpd
+[[files]]
+path = "/usr/lib/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd
+"""
+
+[[files]]
+path = "/usr/lib/init.d/20_resist"
+data = """
+export RUST_BACKTRACE full
+resist /share/resist/redox/spec.toml
+resist /share/resist/posix/base.toml
+resist /share/resist/posix/shell.toml
+shutdown
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"

config/server-minimal.toml

@@ -0,0 +1,23 @@
+# Minimal configuration
+
+include = ["base.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 128
+
+# Package settings
+[packages]
+coreutils = {}
+extrautils = {}
+ion = {}
+smith = {}
+userutils = {}
+
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+getty 2
+getty debug: -J
+"""

config/server.toml

@@ -0,0 +1,44 @@
+# Default server configuration
+
+include = ["net.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 512
+
+# Package settings
+[packages]
+bash = {}
+ca-certificates = {}
+contain = {}
+coreutils = {}
+curl = {}
+diffutils = {}
+extrautils = {}
+findutils = {}
+git = {}
+installer = {}
+ion = {}
+nano = {}
+netdb = {}
+pkgutils = {}
+redoxfs = {}
+relibc = {}
+resist = {}
+smith = {}
+terminfo = {}
+userutils = {}
+vim = {}
+
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+inputd -A 2
+getty 2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"

config/x86_64/acid.toml

@@ -1,86 +1,3 @@
 # Configuration for using acid
 
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-bootloader = {}
-bootstrap = {}
-acid = {}
-coreutils = {}
-# TODO: Does this need escalated?
-escalated = {}
-initfs = {}
-ion = {}
-ipcd = {}
-kernel = {}
-ptyd = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_acid"
-data = """
-export RUST_BACKTRACE full
-acid
-acid create_test
-acid switch
-acid tls
-acid thread
-shutdown
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
+include = ["../acid.toml"]

config/x86_64/ci.toml

@@ -20,18 +20,20 @@ ca-certificates = {}
 cairo = {}
 cairodemo = {}
 #calculator = {}
-#cargo = {} # curl-config not found
+cargo = {}
 cleye = {}
 #cmatrix = {} # needs ncursesw now
 contain = {}
 coreutils = {}
+cosmic-edit = {}
+cosmic-icons = {}
+cosmic-text = {}
 cpal = {}
 curl = {}
 dash = {}
 diffutils = {}
 dosbox = {}
 drivers = {}
-#drivers-041 = {}
 drivers-initfs = {}
 duktape = {}
 eduke32 = {}
@@ -41,19 +43,19 @@ expat = {}
 extrautils = {}
 #fal
 #fd = {} # ctrlc-3.1.1
-#ffmpeg = {} # undefined references
+ffmpeg6 = {}
 findutils = {}
 fontconfig = {}
 #freeciv = {}
 freedoom = {}
 #freeglut = {}
-freetype = {}
+freepats = {}
+freetype2 = {}
 #friar = {} # mio patch
 fribidi = {}
 #game-2048 = {} # rustc-serialize
-games = {}
 #gawk = {} # langinfo.h
-gcc = {}
+gcc13 = {}
 gdbserver = {}
 #gdk-pixbuf = {} # shared-mime-info
 gears = {}
@@ -73,9 +75,11 @@ harfbuzz = {}
 init = {}
 initfs = {}
 installer = {}
+installer-gui = {}
+intel-one-mono = {}
 ion = {}
 ipcd = {}
-jansson = {}
+#jansson = {} # needs config.sub update
 kernel = {}
 keyboard-sfx = {}
 lci = {}
@@ -92,12 +96,14 @@ libvorbis = {}
 libxml2 = {}
 llvm = {}
 logd = {}
-#lua = {} # tmpnam
+lua54 = {}
 #mdp = {} # ncursesw
+mednafen = {}
 mesa = {}
-mesa_glu = {}
+mesa-glu = {}
 mgba = {}
 #miniserve = {} # actix
+nano = {}
 nasm = {}
 #ncdu = {} # fails to link with ncurses
 ncurses = {}
@@ -110,9 +116,9 @@ neverball = {}
 #newlib = {} # obsolete
 #newlibtest = {} # obsolete
 nghttp2 = {}
-nulld = {}
+nushell = {}
 openjazz = {}
-openssl = {}
+openssl1 = {}
 openttd = {}
 openttd-opengfx = {}
 openttd-openmsx = {}
@@ -122,16 +128,17 @@ orbdata = {}
 orbital = {}
 orbterm = {}
 orbutils = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
+#orbutils-background = {} # needs recipe update
+#orbutils-launcher = {} # needs recipe update
+#orbutils-orblogin = {} # needs recipe update
 osdemo = {}
-pango = {}
+#pango = {} # undefined references to std::__throw_system_error(int)
 #pastel = {} # needs crate patches for redox-unix
 patch = {}
 #pathfinder = {} # servo-fontconfig
 #pciids = {}
 pcre = {}
+perg = {}
 periodictable = {}
 #perl = {} # ctermid, tempnam, ttyname
 pixelcannon = {}
@@ -139,8 +146,10 @@ pixman = {}
 #pkgar = {} # uses virtual Cargo.toml, needs recipe update
 pkg-config = {}
 pkgutils = {}
+pop-icon-theme = {}
 #powerline = {} # dirs
 prboom = {}
+procedural-wallpapers-rs = {}
 ptyd = {}
 #python = {} # getaddrinfo
 #qemu = {}
@@ -148,37 +157,39 @@ ramfs = {}
 randd = {}
 readline = {}
 redoxerd = {}
-#redox-fatfs = {}
+redox-fatfs = {}
 redoxfs = {}
-#redox-ssh = {}
+redox-games = {}
+redox-ssh = {}
 relibc = {}
-#relibc-tests = {}
+#relibc-tests = {} # madvise link error
 resist = {}
-retroarch = {}
+#retroarch = {} # OS_TLSIndex not declared
 ripgrep = {}
 rodioplay = {}
 rs-nes = {}
-#rust = {}
+rust = {}
 rust64 = {}
 rust-cairo = {}
 rust-cairo-demo = {}
 rustual-boy = {}
 schismtracker = {}
 scummvm = {}
-sdl = {}
-sdl2 = {}
-sdl2_gears = {}
-sdl2_image = {}
-sdl2_mixer = {}
-sdl2_ttf = {}
-sdl_gfx = {}
-sdl_image = {}
-sdl_mixer = {}
+sdl-gfx = {}
 #sdl-player = {} # wctype_t
-sdl_ttf = {}
+sdl1 = {}
+sdl1-image = {}
+sdl1-mixer = {}
+sdl1-ttf = {}
+sdl2 = {}
+sdl2-gears = {}
+sdl2-image = {}
+sdl2-mixer = {}
+sdl2-ttf = {}
 sed = {}
 #servo = {} # some more crates to port
-#shared-mime-info = {} # intltool-update out of date
+shared-mime-info = {}
+shellharden = {}
 shellstorm = {}
 smith = {}
 sodium = {}
@@ -192,13 +203,13 @@ timidity = {}
 ttf-hack = {}
 userutils = {}
 uutils = {}
-vice = {}
+#vice = {} # linker errors
 vim = {}
 vttest = {}
 vvvvvv = {}
 #webrender = {} # unwind
 #wesnoth = {}
-winit = {}
+#winit = {} # tzset
 xz = {}
 zerod = {}
 zlib = {}

config/x86_64/demo.toml

@@ -22,216 +22,54 @@
 #                                                                            #
 ##############################################################################
 
+include = ["../desktop.toml"]
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 768
-# Do not prompt if settings are not defined
-prompt = false
+filesystem_size = 1536
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# Apps
+# GUI Apps
+cosmic-edit = {}
+cosmic-files = {}
 periodictable = {}
+
+# GUI Data
+cosmic-icons = {}
+intel-one-mono = {}
+pop-icon-theme = {}
+shared-mime-info = {}
+
+# Shell Apps
+curl = {}
+git = {}
+gnu-grep = {}
+ripgrep = {}
 sodium = {}
+vim = {}
 
 # Games
 dosbox = {}
 freedoom = {}
-games = {}
 neverball = {}
 prboom = {}
+redox-games = {}
 sopwith = {}
 syobonaction = {}
 
 # Demos
+acid = {}
+nushell = {}
 orbclient = {}
+pixelcannon = {}
 rodioplay = {}
+gears = {}
 
 # MIDI
 freepats = {}
 
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
-
 [[files]]
 path = "/home/user/Welcome.txt"
 data = """

config/x86_64/desktop-contain.toml

@@ -0,0 +1,41 @@
+# Default desktop configuration using contain
+
+include = ["../desktop.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}
+
+# Override orbital init to use contain_orblogin
+[[files]]
+path = "/usr/lib/init.d/20_orbital"
+data = """
+audiod
+orbital contain_orblogin launcher
+"""
+
+# Override console init to use contain
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+getty --contain 2
+getty --contain debug: -J
+"""
+
+[[files]]
+path = "/etc/contain.toml"
+data = """
+pass_schemes = ["rand", "null", "tcp", "udp", "thisproc", "pty", "orbital", "display.vesa"]
+sandbox_schemes = ["file"]
+files = ["file:/dev/null"]
+rofiles = ["file:/etc/passwd", "file:/etc/hostname", "file:/etc/localtime"]
+dirs = ["file:/tmp"]
+rodirs = ["file:/bin", "file:/ui"]
+"""

config/x86_64/desktop-minimal.toml

@@ -0,0 +1,14 @@
+# Default desktop configuration
+
+include = ["../desktop-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/desktop.toml

@@ -1,191 +1,14 @@
 # Default desktop configuration
 
+include = ["../desktop.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/x86_64/dev.toml

@@ -1,208 +1,14 @@
 # Configuration for development, includes cargo and rustc
 
+include = ["../dev.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 1024
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-cargo = {}
-contain = {}
-coreutils = {}
-curl = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-gcc = {}
-git = {}
-gnu-binutils = {}
-gnu-make = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-rust = {}
-smith = {}
-terminfo = {}
-userutils = {}
-uutils = {}
-vim = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/home/user/example.rs"
-data = """
-fn main() {
-    println!("Hello, Redox!");
-}
-"""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

config/x86_64/jeremy.toml

@@ -1,49 +1,19 @@
 # Jeremy's configuration
 
+include = ["../desktop.toml"]
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 4096
-# Do not prompt if settings are not defined
-prompt = false
+filesystem_size = 8192
 
 # Package settings
 [packages]
-audiod = {}
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-relibc = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
 # apps
+boxedwine = {}
+cosmic-edit = {}
+cosmic-files = {}
+cosmic-term = {}
 cosmic-text = {}
 periodictable = {}
 pixelcannon = {}
@@ -52,15 +22,17 @@ sodium = {}
 
 # cli
 acid = {}
-bash = {}
 cleye = {}
-curl = {}
-ffmpeg = {}
-git = {}
+ffmpeg6 = {}
 gnu-grep = {}
+lua54 = {}
+nano = {}
+nushell = {}
+perg = {}
+relibc-tests = {}
 ripgrep = {}
 sed = {}
-vim = {}
+shellharden = {}
 xz = {}
 
 # demos
@@ -70,41 +42,53 @@ cpal = {}
 gears = {}
 glium = {} # does not show anything
 glutin = {}
+hematite = {}
+iced = {}
+libcosmic = {}
 orbclient = {}
 osdemo = {} # does not show anything
+pathfinder = {}
+procedural-wallpapers-rs = {}
 rodioplay = {}
 rust-cairo = {}
 rust-cairo-demo = {}
-sdl2_gears = {}
+sdl2-gears = {}
 vttest = {}
+webrender = {}
 winit = {}
 
 # dev
 autoconf = {}
 automake = {}
-gcc = {}
+#cargo = {} # openssl issues
+#gcc13 = {} # libiberty errors
 gnu-binutils = {}
 gnu-make = {}
 nasm = {}
 patch = {}
 pkg-config = {}
-rust = {}
+#rust = {} # takes too long to compile
+rustpython = {}
 
 # games
+devilutionx = {}
 dosbox = {}
 eduke32 = {}
+flycast = {}
 freedoom = {}
-games = {}
 gigalomania = {}
+mednafen = {}
 mgba = {}
 neverball = {}
 openjazz = {}
+openjk = {}
 openttd = {}
 openttd-opengfx = {}
 openttd-openmsx = {}
 openttd-opensfx = {}
 prboom = {}
-retroarch = {} # need to package cores
+redox-games = {}
+#retroarch = {} # need to package cores
 rs-nes = {} # need game for testing
 rust64 = {} # need roms
 rustual-boy = {} # need game for testing
@@ -113,162 +97,19 @@ sm64ex = {}
 sopwith = {}
 spacecadetpinball = {}
 syobonaction = {}
-vice = {}
+#vice = {} # broken on new toolchain
 vvvvvv = {}
 
 # stuff
+cosmic-icons = {}
 freepats = {}
 generaluser-gs = {}
+intel-one-mono = {}
 jeremy = {}
 keyboard-sfx = {}
 libc-bench = {}
-terminfo = {}
+noto-color-emoji = {}
+pop-icon-theme = {}
+shared-mime-info = {}
 timidity = {}
 ttf-hack = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/20_orbital"
-data = """
-audiod
-orbital display:3/activate orblogin launcher
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true

config/x86_64/resist.toml

@@ -1,176 +1,3 @@
 # Configuration for using resist
 
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-bootloader = {}
-bootstrap = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-gcc = {}
-gnu-binutils = {}
-gnu-make = {}
-initfs = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netutils = {}
-ptyd = {}
-resist = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd
-"""
-
-[[files]]
-path = "/etc/init.d/20_resist"
-data = """
-export RUST_BACKTRACE full
-resist /share/resist/redox/spec.toml
-resist /share/resist/posix/base.toml
-resist /share/resist/posix/shell.toml
-shutdown
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+include = ["../resist.toml"]

config/x86_64/server-minimal.toml

@@ -0,0 +1,14 @@
+# Minimal configuration
+
+include = ["../server-minimal.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}

config/x86_64/server.toml

@@ -1,177 +1,14 @@
 # Default server configuration
 
+include = ["../server.toml"]
+
+# Override the default settings here
+
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
-# Do not prompt if settings are not defined
-prompt = false
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-bootloader = {}
-bootstrap = {}
-ca-certificates = {}
-contain = {}
-coreutils = {}
-dash = {}
-diffutils = {}
-drivers = {}
-escalated = {}
-extrautils = {}
-findutils = {}
-initfs = {}
-installer = {}
-ion = {}
-ipcd = {}
-kernel = {}
-netdb = {}
-netstack = {}
-netutils = {}
-pkgutils = {}
-ptyd = {}
-redoxfs = {}
-resist = {}
-smith = {}
-userutils = {}
-uutils = {}
-
-# User settings
-[users.root]
-password = "password"
-uid = 0
-gid = 0
-name = "root"
-home = "/root"
-
-[users.user]
-# Password is unset
-password = ""
-
-[[files]]
-path = "/etc/init.d/00_base"
-data = """
-ipcd
-ptyd
-pcid /etc/pcid.d/
-escalated
-"""
-
-[[files]]
-path = "/etc/init.d/10_net"
-data = """
-smolnetd
-dnsd
-dhcpd -b
-"""
-
-[[files]]
-path = "/etc/init.d/30_console"
-data = """
-getty display:2/activate
-getty debug: -J
-"""
-
-[[files]]
-path = "/etc/net/dns"
-data = """
-208.67.222.222
-"""
-
-[[files]]
-path = "/etc/net/ip"
-data = """
-10.0.2.15
-"""
-
-[[files]]
-path = "/etc/net/ip_router"
-data = """
-10.0.2.2
-"""
-
-[[files]]
-path = "/etc/net/ip_subnet"
-data = """
-255.255.255.0
-"""
-
-[[files]]
-path = "/etc/net/mac"
-data = """
-54-52-00-ab-cd-ef
-"""
-
-[[files]]
-path = "/etc/pkg.d/50_redox"
-data = "https://static.redox-os.org/pkg"
-
-[[files]]
-path = "/etc/redox-release"
-data = "0.8.0"
-
-[[files]]
-path = "/etc/group"
-data = """
-root;0;root
-user;1000;user
-sudo;1;user
-"""
-
-[[files]]
-path = "/etc/hostname"
-data = """
-redox
-"""
-
-[[files]]
-path = "/usr/bin"
-data = "../bin"
-symlink = true
-
-[[files]]
-path = "/usr/games"
-data = "../games"
-symlink = true
-
-[[files]]
-path = "/usr/include"
-data = "../include"
-symlink = true
-
-[[files]]
-path = "/usr/lib"
-data = "../lib"
-symlink = true
-
-[[files]]
-path = "/usr/share"
-data = "../share"
-symlink = true
-
-[[files]]
-path = "/tmp"
-data = ""
-directory= true
-# 0o1777
-mode = 1023
-
-[[files]]
-path = "/dev/null"
-data = "null:"
-symlink = true
-
-[[files]]
-path = "/dev/random"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/urandom"
-data = "rand:"
-symlink = true
-
-[[files]]
-path = "/dev/zero"
-data = "zero:"
-symlink = true
+# example = {}

cookbook

@@ -1 +1 @@
-Subproject commit 3d72057d3a309269df674c4ca874161302fa26a8
+Subproject commit d0378b5c485ef7943e744ebeda4ecc453c7cd7b7

docker/Dockerfile

@@ -30,8 +30,8 @@ RUN set -ex;                                                                   \
         x86-64-unknown-redox-binutils                                          \
         x86-64-unknown-redox-gcc                                               \
         ;                                                                      \
-    cargo install xargo;                                                       \
     cargo install cargo-config;                                                \
+    cargo install just@1.16.0;                                                 \
     apt-get autoremove -q -y;                                                  \
     apt-get clean -q -y;                                                       \
     rm -rf /var/lib/apt/lists/*

installer

@@ -1 +1 @@
-Subproject commit f710fa79db52e86f2c93c1bfa4f6ef0614c15a30
+Subproject commit 1c30f4a3c1f55974aed694b478ff77c0552a1576

mk/ci.mk

@@ -8,12 +8,13 @@ ci-img: FORCE
 	rm -rf $(IMG_DIR)
 	mkdir -p $(IMG_DIR)
 	$(MAKE) demo desktop server
+	cd $(IMG_DIR) && zstd --rm *
 	cd $(IMG_DIR) && sha256sum -b * > SHA256SUM
 
 # The name of the target must match the name of the filesystem config file
 desktop server demo: FORCE
 	rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso"
-	$(MAKE) FILESYSTEM_CONFIG=config/$(ARCH)/$@.toml build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso
+	$(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso
 	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"
 
@@ -25,7 +26,7 @@ ci-pkg: prefix FORCE
 	PACKAGES="$$($(INSTALLER) --list-packages -c config/$(ARCH)/ci.toml)" && \
 	cd cookbook && \
 	./fetch.sh "$${PACKAGES}" && \
-	./repo.sh "$${PACKAGES}"
+	./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
 
 # CI toolchain
 ci-toolchain: FORCE

mk/config.mk

@@ -1,18 +1,29 @@
 -include .config
 
+HOST_ARCH?=$(shell uname -m)
+
 # Configuration
-## Architecture to build Redox for (aarch64, i686, or x86_64)
-ARCH?=x86_64
+## Architecture to build Redox for (aarch64, i686, or x86_64). Defaults to a host one
+ARCH?=$(HOST_ARCH)
+## Sub-device type for aarch64 if needed
+BOARD?=
 ## Enable to use binary prefix (much faster)
 PREFIX_BINARY?=1
 ## Enable to use binary packages (much faster)
 REPO_BINARY?=0
-## Select filesystem config
-FILESYSTEM_CONFIG?=config/$(ARCH)/desktop.toml
-## Filesystem size in MB (default comes from filesystem_size in the FILESYSTEM_CONFIG)
-FILESYSTEM_SIZE?=$(shell grep filesystem_size $(FILESYSTEM_CONFIG) | cut -d' ' -f3)
 ## Name of the configuration to include in the image name e.g. desktop or server
-CONFIG_NAME?=$(shell basename $(FILESYSTEM_CONFIG) .toml)
+CONFIG_NAME?=desktop
+## Ignore errors when building the repo, attempt to build every package
+## REPO_NONSTOP?=--nonstop
+REPO_NONSTOP?=
+## Select filesystem config
+ifeq ($(BOARD),)
+FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml
+else
+FILESYSTEM_CONFIG?=config/$(ARCH)/$(BOARD)/$(CONFIG_NAME).toml
+endif
+## Filesystem size in MB (default comes from filesystem_size in the FILESYSTEM_CONFIG)
+FILESYSTEM_SIZE?=$(shell cargo run --release --manifest-path installer/Cargo.toml -- --filesystem-size -c $(FILESYSTEM_CONFIG))
 ## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption
 REDOXFS_MKFS_FLAGS?=
 ## Set to 1 to enable Podman build, any other value will disable it
@@ -21,39 +32,43 @@ PODMAN_BUILD?=0
 CONTAINERFILE?=podman/redox-base-containerfile
 
 # Per host variables
-# TODO: get host arch automatically
-HOST_ARCH=x86_64
-HOST_CARGO=env --unset=RUSTUP_TOOLCHAIN cargo
+HOST_CARGO=env -u RUSTUP_TOOLCHAIN cargo
+export NPROC=nproc
+export REDOX_MAKE=make
+HOST_TARGET := $(shell env -u RUSTUP_TOOLCHAIN rustc -vV | grep host | cut -d: -f2 | tr -d " ")
 UNAME := $(shell uname)
 ifeq ($(UNAME),Darwin)
-	FUMOUNT=sudo umount
+	FUMOUNT=umount
 	export NPROC=sysctl -n hw.ncpu
-	export REDOX_MAKE=make
-	PREFIX_BINARY=0
 	VB_AUDIO=coreaudio
 	VBM=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage
-	HOST_TARGET ?= $(HOST_ARCH)-apple-darwin
 else ifeq ($(UNAME),FreeBSD)
 	FUMOUNT=sudo umount
-	export NPROC=sysctl -n hw.ncpu
 	export REDOX_MAKE=gmake
-	PREFIX_BINARY=0
-	VB_AUDIO=pulse # To check, will probaly be OSS on most setups
+	VB_AUDIO=pulse # To check, will probably be OSS on most setups
 	VBM=VBoxManage
-	HOST_TARGET ?= $(HOST_ARCH)-unknown-freebsd
 else
-	FUMOUNT=fusermount -u
-	export NPROC=nproc
-	export REDOX_MAKE=make
+	# Detect which version of the fusermount binary is available.
+	ifneq (, $(shell which fusermount3))
+		FUMOUNT=fusermount3 -u
+	else
+		FUMOUNT=fusermount -u
+	endif
+
 	VB_AUDIO=pulse
 	VBM=VBoxManage
-	HOST_TARGET ?= $(HOST_ARCH)-unknown-linux-gnu
+endif
+
+ifneq ($(UNAME),Linux)
+	PREFIX_BINARY=0
+endif
+ifneq ($(HOST_ARCH),x86_64)
+	PREFIX_BINARY=0
 endif
 
 # Automatic variables
 ROOT=$(CURDIR)
 export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
-export XARGO_RUST_SRC=$(ROOT)/rust/src
 
 ## Userspace variables
 export TARGET=$(ARCH)-unknown-redox
@@ -62,8 +77,14 @@ INSTALLER=installer/target/release/redox_installer
 ifeq ($(REPO_BINARY),0)
 INSTALLER+=--cookbook=cookbook
 REPO_TAG=$(BUILD)/repo.tag
+else
+INSTALLER+=--cookbook=cookbook --repo-binary
+REPO_TAG=$(BUILD)/repo.tag
 endif
 
+FSTOOLS_TAG=build/fstools.tag
+export BOARD
+
 ## Cross compiler variables
 AR=$(TARGET)-gcc-ar
 AS=$(TARGET)-as

mk/depends.mk

@@ -7,10 +7,18 @@ ifeq ($(shell which rustup),)
 $(error rustup not found, install from "https://rustup.rs/")
 endif
 
+ifeq ($(shell which cbindgen),)
+$(error cbindgen not found, install from crates.io or from your package manager)
+endif
+
 ifeq ($(shell which nasm),)
 $(error nasm not found, install from your package manager)
 endif
 
+ifeq ($(shell which just),)
+$(error just not found, install from crates.io or from your package manager)
+endif
+
 CARGO_CONFIG_VERSION=0.1.1
 ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config v$(CARGO_CONFIG_VERSION):$$'),)
 $(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config")

mk/disk.mk

@@ -1,47 +1,44 @@
-$(BUILD)/harddrive.img: $(REPO_TAG)
+$(BUILD)/harddrive.img: $(FSTOOLS_TAG) $(REPO_TAG)
 	mkdir -p $(BUILD)
 	rm -rf $@  $@.partial
 	-$(FUMOUNT) /tmp/redox_installer || true
-	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
-	$(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
+	truncate -s "$(FILESYSTEM_SIZE)m" $@.partial
+	umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
 	mv $@.partial $@
 
-$(BUILD)/livedisk.iso: $(REPO_TAG)
+$(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG)
 	mkdir -p $(BUILD)
 	rm -rf $@  $@.partial
 	-$(FUMOUNT) /tmp/redox_installer || true
-	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
-	$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
+	truncate -s "$(FILESYSTEM_SIZE)m" $@.partial
+	umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
 	mv $@.partial $@
 
-$(BUILD)/filesystem.img: $(REPO_TAG)
+$(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG)
 	mkdir -p $(BUILD)
-	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	rm -rf $@  $@.partial $(BUILD)/filesystem/
 	-$(FUMOUNT) /tmp/redox_installer || true
-	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
+	truncate -s "$(FILESYSTEM_SIZE)m" $@.partial
 	redoxfs/target/release/redoxfs-mkfs $(REDOXFS_MKFS_FLAGS) $@.partial
 	mkdir -p $(BUILD)/filesystem/
 	redoxfs/target/release/redoxfs $@.partial $(BUILD)/filesystem/
 	sleep 1
 	pgrep redoxfs
-	$(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/
+	umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/
 	sync
 	-$(FUMOUNT) $(BUILD)/filesystem/ || true
 	rm -rf $(BUILD)/filesystem/
 	mv $@.partial $@
 
-mount: FORCE
+mount: $(FSTOOLS_TAG) FORCE
 	mkdir -p $(BUILD)/filesystem/
-	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
 	redoxfs/target/release/redoxfs $(BUILD)/harddrive.img $(BUILD)/filesystem/
 	sleep 2
 	pgrep redoxfs
 
-mount_extra: FORCE
+mount_extra: $(FSTOOLS_TAG) FORCE
 	mkdir -p $(BUILD)/filesystem/
-	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
 	redoxfs/target/release/redoxfs $(BUILD)/extra.img $(BUILD)/filesystem/
 	sleep 2
 	pgrep redoxfs

mk/fstools.mk

@@ -0,0 +1,22 @@
+fstools: $(FSTOOLS_TAG)
+
+$(FSTOOLS_TAG): cookbook installer redoxfs $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
+	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs --bin redoxfs-mkfs
+	mkdir -p build
+	touch $@
+endif
+
+fstools_clean: FORCE $(CONTAINER_TAG)
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	$(HOST_CARGO) clean --manifest-path cookbook/Cargo.toml
+	$(HOST_CARGO) clean --manifest-path installer/Cargo.toml
+	$(HOST_CARGO) clean --manifest-path redoxfs/Cargo.toml
+	rm -f $(FSTOOLS_TAG)
+endif

mk/podman.mk

@@ -8,9 +8,9 @@ IMAGE_TAG?=redox-base
 ## Working Directory in Podman
 CONTAINER_WORKDIR?=/mnt/redox
 ## Podman Home Directory
-PODMAN_HOME?="`pwd`/build/podman"
+PODMAN_HOME?=$(ROOT)/build/podman
 ## Podman command with its many arguments
-PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home:Z
+PODMAN_VOLUMES?=--volume $(ROOT):$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home: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_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 --tty --env TERM=$(TERM)
@@ -23,6 +23,9 @@ else
 	@echo PODMAN_BUILD=$(PODMAN_BUILD), please set it to 1 in mk/config.mk
 endif
 
+container_su: FORCE
+	podman exec --user=0 --latest --interactive --tty bash
+
 container_clean: FORCE
 	rm -f build/container.tag
 	@echo "If podman dir cannot be removed, remove with \"sudo rm\"."
@@ -39,6 +42,9 @@ else
 	@echo PODMAN_BUILD=$(PODMAN_BUILD), container not required.
 endif
 
+container_kill: FORCE
+	podman kill --latest --signal SIGKILL
+
 ## Must match the value of CONTAINER_TAG in config.mk
 build/container.tag: $(CONTAINERFILE)
 ifeq ($(PODMAN_BUILD),1)

mk/prefix.mk

@@ -3,10 +3,16 @@ PREFIX=prefix/$(TARGET)
 PREFIX_INSTALL=$(PREFIX)/relibc-install
 PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin
 
+BINUTILS_BRANCH=redox-2.41
+GCC_BRANCH=redox-13.2.0
+
 export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
 export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
 export REDOXER_TOOLCHAIN=$(RUSTUP_TOOLCHAIN)
 
+export CC=
+export CXX=
+
 prefix: $(PREFIX_INSTALL)
 
 PREFIX_STRIP=\
@@ -16,7 +22,13 @@ PREFIX_STRIP=\
 		-exec strip --strip-unneeded {} ';' \
 		2> /dev/null
 
-$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG)
+$(PREFIX)/relibc: $(ROOT)/relibc
+	mkdir -p "$(@D)"
+	rm -rf "$@.partial" "$@"
+	cp -r "$^" "$@.partial"
+	mv "$@.partial" "$@"
+
+$(PREFIX)/relibc-install: $(PREFIX)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
@@ -25,12 +37,10 @@ else
 	rm -rf "$@.partial/$(TARGET)/include/"*
 	cp -r "$(PREFIX)/rust-install/$(TARGET)/include/c++" "$@.partial/$(TARGET)/include/c++"
 	cp -r "$(PREFIX)/rust-install/lib/rustlib/$(HOST_TARGET)/lib/" "$@.partial/lib/rustlib/$(HOST_TARGET)/"
-	rm -rf $@.partial/lib/rustlib/src
-	mkdir $@.partial/lib/rustlib/src
-	ln -s $(ROOT)/rust $@.partial/lib/rustlib/src
 	cd "$<" && \
 	export PATH="$(ROOT)/$@.partial/bin:$$PATH" && \
 	export CARGO="env -u CARGO cargo" && \
+	$(MAKE) clean && \
 	$(MAKE) -j `$(NPROC)` all && \
 	$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
 	cd "$@.partial" && $(PREFIX_STRIP)
@@ -63,18 +73,22 @@ $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz
 
 else
 
+$(ROOT)/rust:
+	git submodule update --init --recursive --checkout rust
+
 PREFIX_BASE_INSTALL=$(PREFIX)/rust-freestanding-install
 PREFIX_FREESTANDING_INSTALL=$(PREFIX)/gcc-freestanding-install
 
 PREFIX_BASE_PATH=$(ROOT)/$(PREFIX_BASE_INSTALL)/bin
 PREFIX_FREESTANDING_PATH=$(ROOT)/$(PREFIX_FREESTANDING_INSTALL)/bin
 
-$(PREFIX)/binutils.tar.bz2:
+$(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2:
 	mkdir -p "$(@D)"
-	wget -O $@.partial "https://gitlab.redox-os.org/redox-os/binutils-gdb/-/archive/redox/binutils-gdb-redox.tar.bz2"
+	rm -fv $(PREFIX)/binutils*.tar.bz2*
+	wget -O $@.partial "https://gitlab.redox-os.org/redox-os/binutils-gdb/-/archive/$(BINUTILS_BRANCH)/binutils-gdb-$(BINUTILS_BRANCH).tar.bz2"
 	mv $@.partial $@
 
-$(PREFIX)/binutils: $(PREFIX)/binutils.tar.bz2
+$(PREFIX)/binutils: $(PREFIX)/binutils-$(BINUTILS_BRANCH).tar.bz2
 	rm -rf "$@.partial" "$@"
 	mkdir -p "$@.partial"
 	tar --extract --file "$<" --directory "$@.partial" --strip-components=1
@@ -102,12 +116,13 @@ else
 	mv "$@.partial" "$@"
 endif
 
-$(PREFIX)/gcc.tar.bz2:
+$(PREFIX)/gcc-$(GCC_BRANCH).tar.bz2:
 	mkdir -p "$(@D)"
-	wget -O $@.partial "https://gitlab.redox-os.org/redox-os/gcc/-/archive/redox/gcc-redox.tar.bz2"
+	rm -fv $(PREFIX)/gcc*.tar.bz2*
+	wget -O $@.partial "https://gitlab.redox-os.org/redox-os/gcc/-/archive/$(GCC_BRANCH)/gcc-$(GCC_BRANCH).tar.bz2"
 	mv "$@.partial" "$@"
 
-$(PREFIX)/gcc: $(PREFIX)/gcc.tar.bz2
+$(PREFIX)/gcc: $(PREFIX)/gcc-$(GCC_BRANCH).tar.bz2
 	mkdir -p "$@.partial"
 	tar --extract --file "$<" --directory "$@.partial" --strip-components=1
 	cd "$@.partial" && ./contrib/download_prerequisites
@@ -151,23 +166,23 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
 		--enable-extended \
 		--enable-lld \
 		--enable-llvm-static-stdcpp \
 		--set 'llvm.targets=AArch64;X86' \
 		--set 'llvm.experimental-targets=' \
-		--tools=cargo \
+		--tools=cargo,src \
 		&& \
 	$(MAKE) -j `$(NPROC)` && \
 	$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
 	rm -rf "$(PREFIX)/rust-freestanding-build"
 	mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/bin"
+	mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/lib"
 	cd "$@.partial" && $(PREFIX_STRIP)
 	touch "$@.partial"
 	mv "$@.partial" "$@"
-	mkdir $@/lib/rustlib/src
-	ln -s $(ROOT)/rust $@/lib/rustlib/src
 endif
 
 $(PREFIX)/relibc-freestanding-install: $(ROOT)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG)
@@ -180,6 +195,7 @@ else
 	export PATH="$(PREFIX_BASE_PATH):$(PREFIX_FREESTANDING_PATH):$$PATH" && \
 	export CARGO="env -u CARGO -u RUSTUP_TOOLCHAIN cargo" && \
 	export CC_$(subst -,_,$(TARGET))="$(TARGET)-gcc -isystem $(ROOT)/$@.partial/$(TARGET)/include" && \
+	$(MAKE) clean && \
 	$(MAKE) -j `$(NPROC)` all && \
 	$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial/$(TARGET)"
 	cd "$@.partial" && $(PREFIX_STRIP)
@@ -240,18 +256,21 @@ else
 	"$</configure" \
 		--prefix="/" \
 		--disable-docs \
+		--disable-download-ci-llvm \
 		--enable-cargo-native-static \
+		--enable-dist-src \
 		--enable-extended \
 		--enable-lld \
 		--enable-llvm-static-stdcpp \
-		--tools=cargo \
+		--tools=cargo,src \
 		--target="$(HOST_TARGET),$(TARGET)" \
 		&& \
 	$(MAKE) -j `$(NPROC)` && \
-	rm -rf "$(ROOT)/$@.partial/lib/rustlib" "$(ROOT)/$@.partial/share/doc/rust" && \
+	rm -rf $(ROOT)/$@.partial/lib/rustlib/{components,install.log,rust-installer-version,uninstall.sh,manifest-*} "$(ROOT)/$@.partial/share/doc/rust" && \
 	$(MAKE) -j `$(NPROC)` install DESTDIR="$(ROOT)/$@.partial"
 	rm -rf "$(PREFIX)/rust-build"
 	mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/bin"
+	mkdir -p "$@.partial/lib/rustlib/$(HOST_TARGET)/lib"
 	cd "$@.partial" && find . -name *.old -exec rm {} ';' && $(PREFIX_STRIP)
 	touch "$@.partial"
 	mv "$@.partial" "$@"

mk/qemu.mk

@@ -1,5 +1,5 @@
 QEMU=SDL_VIDEO_X11_DGAMOUSE=0 qemu-system-$(QEMU_ARCH)
-QEMUFLAGS=-d cpu_reset,guest_errors
+QEMUFLAGS=-d guest_errors -name "Redox OS $(ARCH)"
 
 ifeq ($(ARCH),i686)
 	audio?=ac97
@@ -7,7 +7,12 @@ ifeq ($(ARCH),i686)
 	QEMU_ARCH=i386
 	QEMU_MACHINE?=pc
 	QEMU_CPU?=pentium2
-	QEMUFLAGS+=-smp 4 -m 2048
+	QEMUFLAGS+=-smp 1 -m 1024
+
+	# Default to using kvm when arch is i686 and host is x86_64
+	ifeq ($(HOST_ARCH),x86_64)
+		kvm?=yes
+	endif
 else ifeq ($(ARCH),x86_64)
 	QEMU_ARCH=x86_64
 	QEMU_MACHINE?=q35
@@ -16,17 +21,18 @@ else ifeq ($(ARCH),x86_64)
 	QEMUFLAGS+=-smp 4 -m 2048
 else ifeq ($(ARCH),aarch64)
 	efi=yes
-	kvm=no
 	live=yes
-	#TODO: support vga
-	vga=no
 	QEMU_ARCH=aarch64
 	QEMU_MACHINE=virt
 	QEMU_CPU=max
-	QEMU_EFI=/usr/share/AAVMF/AAVMF_CODE.fd
+	ifeq ($(BOARD),raspi3bp)
+		QEMU_EFI=https://gitlab.redox-os.org/Ivan/redox_firmware/-/raw/main/platform/raspberry_pi/rpi3/u-boot-rpi-3-b-plus.bin
+	else
+		QEMU_EFI=https://gitlab.redox-os.org/Ivan/redox_firmware/-/raw/main/platform/qemu/qemu_arm64/u-boot-qemu-arm64.bin
+	endif
 	QEMUFLAGS+=-smp 1 -m 2048
 	ifneq ($(vga),no)
-		QEMUFLAGS+=-device virtio-gpu-pci
+		QEMUFLAGS+=-device ramfb
 	endif
 	ifneq ($(usb),no)
 		QEMUFLAGS+=-device usb-ehci -device usb-kbd -device usb-mouse
@@ -35,6 +41,12 @@ else
 $(error Unsupported ARCH for QEMU "$(ARCH)"))
 endif
 
+# If host and target arch do not match, disable kvm
+# (unless overridden above or by environment)
+ifneq ($(ARCH),$(HOST_ARCH))
+	kvm?=no
+endif
+
 ifeq ($(efi),yes)
 	FIRMWARE=$(BUILD)/firmware.rom
 	QEMUFLAGS+=-bios $(BUILD)/firmware.rom
@@ -68,11 +80,19 @@ else ifeq ($(audio),ac97)
 	QEMUFLAGS+=-device AC97
 else
 	# Intel High Definition Audio
-	QEMUFLAGS+=-device ich9-intel-hda -device hda-duplex
+	QEMUFLAGS+=-device ich9-intel-hda -device hda-output
 endif
 
 ifeq ($(net),no)
 	QEMUFLAGS+=-net none
+else ifeq ($(net),rtl8139)
+	# RTL8139
+	QEMUFLAGS+=-netdev user,id=net0 -device rtl8139,netdev=net0 \
+				-object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap
+else ifeq ($(net),virtio)
+	# virtio-net
+	QEMUFLAGS+=-netdev user,id=net0 -device virtio-net,netdev=net0 \
+				-object filter-dump,id=f1,netdev=net0,file=$(BUILD)/network.pcap
 else
 	ifneq ($(bridge),)
 		QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
@@ -90,6 +110,10 @@ endif
 
 ifeq ($(vga),no)
 	QEMUFLAGS+=-nographic -vga none
+else ifeq ($(vga),multi)
+	QEMUFLAGS+=-display sdl -vga std -device secondary-vga
+else ifeq ($(vga),virtio)
+	QEMUFLAGS+=-vga virtio
 endif
 
 ifneq ($(usb),no)
@@ -97,7 +121,7 @@ ifneq ($(usb),no)
 endif
 
 ifeq ($(gdb),yes)
-	QEMUFLAGS+=-s -S
+	QEMUFLAGS+=-d cpu_reset -s -S
 endif
 
 ifeq ($(UNAME),Linux)
@@ -108,21 +132,23 @@ ifeq ($(UNAME),Linux)
 	endif
 endif
 
-ifeq ($(UNAME),Linux)
-$(BUILD)/extra.img:
-	fallocate --posix --length 1G $@
-else
-$(BUILD)/extra.img:
-	truncate -s 1g $@
+ifeq ($(UNAME),Darwin)
+	QEMUFLAGS+=-cpu $(QEMU_CPU)
 endif
 
+$(BUILD)/extra.img:
+	truncate -s 1g $@
+
 $(BUILD)/firmware.rom:
+ifeq ($(ARCH),aarch64)
+	wget -O $@ $(QEMU_EFI)
+else
 	cp $(QEMU_EFI) $@
+endif
 
 qemu: $(DISK) $(FIRMWARE) $(BUILD)/extra.img
 	$(QEMU) $(QEMUFLAGS) \
-		-hdc $(DISK)
-		echo -drive file=$(DISK),format=raw \
+		-drive file=$(DISK),format=raw \
 		-drive file=$(BUILD)/extra.img,format=raw
 
 qemu_no_build: $(FIRMWARE) $(BUILD)/extra.img
@@ -162,3 +188,9 @@ qemu_extra: $(FIRMWARE) $(BUILD)/extra.img
 qemu_nvme_extra: $(FIRMWARE) $(BUILD)/extra.img
 	$(QEMU) $(QEMUFLAGS) \
 		-drive file=$(BUILD)/extra.img,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA
+
+#additional steps for $(DISK) are required!!!
+qemu_raspi: $(FIRMWARE) $(DISK)
+	$(QEMU) -M raspi3b -smp 4,cores=1 \
+		-kernel $(FIRMWARE) \
+		-serial stdio -display none -sd $(DISK)

mk/repo.mk

@@ -1,9 +1,7 @@
-$(BUILD)/fetch.tag: cookbook installer prefix $(FILESYSTEM_CONFIG) $(CONTAINER_TAG)
+$(BUILD)/fetch.tag: prefix $(FSTOOLS_TAG) $(FILESYSTEM_CONFIG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
-	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
-	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
 	PACKAGES="$$($(INSTALLER) --list-packages -c $(FILESYSTEM_CONFIG))" && \
 	cd cookbook && \
 	./fetch.sh "$${PACKAGES}"
@@ -11,18 +9,74 @@ else
 	touch $@
 endif
 
-$(BUILD)/repo.tag: $(BUILD)/fetch.tag $(CONTAINER_TAG)
+$(BUILD)/repo.tag: $(BUILD)/fetch.tag $(FSTOOLS_TAG) $(CONTAINER_TAG)
 ifeq ($(PODMAN_BUILD),1)
 	$(PODMAN_RUN) $(MAKE) $@
 else
-	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
-	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
 	export PATH="$(PREFIX_PATH):$$PATH" && \
 	PACKAGES="$$($(INSTALLER) --list-packages -c $(FILESYSTEM_CONFIG))" && \
 	cd cookbook && \
-	./repo.sh "$${PACKAGES}"
+	./repo.sh $(REPO_NONSTOP) "$${PACKAGES}"
 	mkdir -p $(BUILD)
 	# make sure fetch.tag is newer than the things repo modifies
 	touch $<
 	touch $@
 endif
+
+# Invoke clean.sh for a single target
+c.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	cd cookbook && \
+	./clean.sh $*
+endif
+
+# Invoke fetch.sh for a single target
+f.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	cd cookbook && \
+	./fetch.sh $*
+endif
+
+# Invoke repo.sh for a single target
+r.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	cd cookbook && \
+	./repo.sh $*
+endif
+
+# Invoke unfetch.sh for a single target
+u.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) $(MAKE) $@
+else
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+	cd cookbook && \
+	./unfetch.sh $*
+endif
+
+# Invoke clean.sh, and repo.sh for a single target
+cr.%: $(FSTOOLS_TAG) FORCE
+	$(MAKE) c.$*
+	$(MAKE) r.$*
+
+# Invoke unfetch.sh, clean.sh, and repo.sh for a single target
+ucr.%: $(FSTOOLS_TAG) FORCE
+	$(MAKE) u.$*
+	$(MAKE) cr.$*
+
+uc.%: $(FSTOOLS_TAG) FORCE
+	$(MAKE) u.$*
+	$(MAKE) c.$*
+
+ucf.%: (FSTOOLS_TAG) FORCE
+	$(MAKE) uc.$*
+	$(MAKE) f.$*

podman/README.md

@@ -1,242 +0,0 @@
-# Using Rootless Podman for your build
-
-To make the Redox build process more consistent across platforms, we are using **Rootless Podman** for major parts of the build. **Podman** is invoked automatically and transparently within the Makefiles.
-
-## Disabling Podman build
-
-By default, the build process should operate as it did in the past. The variable **PODMAN_BUILD** in `mk/config.mk` defaults to zero, so that **Podman** will not be invoked.
-
-## TL;DR - [New](#new-working-directory) or [Existing](#existing-working-directory) Working Directory
-
-### New Working Directory 
-
-- Make sure you have the `curl` command. E.g. for Pop!_OS/Ubuntu/Debian:
-```sh
-which curl || sudo apt-get install curl 
-```
-- Make a directory, get a copy of `podman_bootstrap.sh` and run it. This will clone the repository and install **Podman**.
-```sh
-mkdir -p ~/tryredox
-cd ~/tryredox
-curl -sf https://gitlab.redox-os.org/redox-os/redox/raw/master/podman_bootstrap.sh -o podman_bootstrap.sh
-time bash -e podman_bootstrap.sh
-```
-- Change to the `redox` directory.
-```sh
-cd ~/tryredox/redox
-```
-- Edit `mk/config.mk` and change PODMAN_BUILD to 1.
-```sh
-gedit mk/config.mk &
-```
-```
-...
-PODMAN_BUILD?=1
-...
-```
-- Build the system.
-```sh
-time make all
-```
-
-### Existing Working Directory
-
-- Change to your working directory and get the updates to the build files.
-```sh
-cd ~/tryredox/redox
-git fetch upstream master
-git rebase upstream/master
-```
-
-- Install **Podman**. Many distros require additional packages. Check the [Minimum Installation](#minimum-installation) instructions to see what is needed for your distro. Or, run the following in your working directory:
-```sh
-./podman_bootstrap.sh -d
-```
-
-- Set `PODMAN_BUILD` to 1 and run `make`.
-```sh
-export PODMAN_BUILD=1
-make all
-```
-
-To ensure `PODMAN_BUILD` is properly set for future builds, edit `mk/config.mk` and change its value.
-```sh
-gedit mk/config.mk &
-```
-```
-...
-PODMAN_BUILD?=1
-...
-```
-
-## Minimum Installation
-
-Most of the packages required for the build are installed in the container as part of the build process. However, some packages need to be installed on the host computer. You may also need to install an emulator such as **QEMU**. This is done for you in `podman_bootstrap.sh`, but you can do a minimum install by following the instructions below.
-
-### Pop!_OS
-
-```sh
-sudo apt-get install podman
-```
-
-### Ubuntu
-
-```sh
-sudo apt-get install podman curl git make libfuse-dev
-```
-
-### ArchLinux
-
-```sh
-sudo pacman -S --needed git podman fuse
-```
-
-### Fedora
-
-```sh
-sudo dnf install podman
-```
-
-## Podman Build Overview
-
-**Podman** is a container that executes a virtual machine image. In our case, we are creating an **Ubuntu** image, with a **Rust** installation and all the packages needed to build the system.
-
-The build process is performed in your normal working directory, e.g. `~/tryredox/redox`. Compilation of the Redox components is performed in the container, but the final Redox image (`build/ARCH/CONFIG/harddrive.img` or `build/ARCH/CONFIG/livedisk.iso`) is constructed using [Fuse](https://github.com/libfuse/libfuse) running directly on your host machine.
-
-Setting `PODMAN_BUILD` to 1 in the environment (e.g. `PODMAN_BUILD=1 make all`) or in `mk/config.mk` will cause **Podman** to be invoked when building.
-
-First, a **base image** called `redox_base` will be constructed, with all the necessary packages for the build. A "home" directory will also be created in the image. This is the home directory of your container alter ego, `poduser`. It will contain the `rustup` install, and the `.bashrc`. This takes some time, but is only done when necessary. The *tag* file [build/container.tag](#buildcontainertag) is also created at this time to prevent unnecessary image builds.
-
-Then, various `make` commands are executed in **containers** built from the **base image**. The files are constructed in your working directory tree, just as they would for a non-Podman build. In fact, if all necessary packages are installed on your host system, you can switch Podman on and off relatively seamlessly, although there is no benefit to doing so.
-
-The build process is using **Podman**'s `keep-id` feature, which allows your regular User ID to be mapped to `poduser` in the container. The first time a container is built, it takes some time to set up this mapping. In order to minimize the impact of this, immediately after creating the image, a throw-away container is built. After the first container is built, new containers can be built almost instantly.
-
-### NOTES
-
-- Envionment and Command Line Variables, other than ARCH, CONFIG_NAME and FILESYSTEM_CONFIG, are not passed to the part of `make` that is done in **Podman**. You must set any other config variables in `mk/config.mk` and not on the command line or in your environment.
-
-- If you are building your own software to include in Redox, and you need to install additional packages using `apt-get` for the build, follow [Adding Packages to the Build](#adding-packages-to-the-build).
-
-## build/container.tag
-
-The building of the **image** is controlled by the *tag* file `build/container.tag`. If you run `make all` with **PODMAN_BUILD=1**, the file `build/container.tag` will be created after the **image** is built. This file tells `make` that it can skip updating the **image** after the first time.
-
-Many targets in the Makefiles `mk/*.mk` include `build/container.tag` as a dependency. If the *tag* file is missing, building any of those targets may trigger an image to be created, which can take some time.
-
-When you move to a new working directory, if you want to save a few minutes, and you are confident that your **image** is correct, you can do
-```sh
-make container_touch
-```
-This will create the file `build/container.tag` without rebuilding the image. However, it will fail if the image does not exist. If it fails, just do a normal `make`, it will create the container when needed.
-
-## Cleaning Up
-
-To remove the **base image**, any lingering containers, and `build/container.tag`, use
-```sh
-make container_clean
-```
-
-To check that everything has been removed,
-```sh
-podman ps -a
-podman images
-```
-will show any remaining images or containers. If you need to do further cleanup,
-```
-podman system reset
-```
-will remove **all** images and containers. You still may need to remove `build/container.tag` if you did not do `make container_clean`.
-
-**Note:** `make clean` could trigger an image build. It invokes `cargo clean` on various components, which it must run in a container, since the build is designed to not require **Cargo** on your host machine. `make clean` does **not** run `make container_clean` and will **not** remove the container image.
-
-## Debugging your Build Process
-
-If you are developing your own components and wish to do one-time debugging to determine what package you are missing in the **Podman Build** environment, the following instructions can help. Note that your changes will not be persistent. After debugging, **you must** [Add your Packages to the Build](#adding-packages-to-the-build). With **PODMAN_BUILD=1**, run the command:
-```sh
-make container_shell
-```
-
-This will start a `bash` shell in the **Podman** container environment, as a normal user without `sudo` privilege. Within that environment, you can build the Redox components with:
-```sh
-make repo
-```
-or, if you need to change `ARCH` or `CONFIG_NAME`,
-```sh
-./build.sh -a ARCH -c CONFIG_NAME repo
-```
-
-If you need `root` privileges, while you are **still running** the above `bash` shell, go to a separate **Terminal** or **Console** window on the host and type:
-```sh
-podman ps
-```
-
-This will list all running containers. There should be only one, but if there is more than one, consider only the newest. In the last column of the display, the container will have a randomly generated name `ADJECTIVE_NOUN`, e.g. `boring_dickens`. Replace the word `CONTAINER` with that name and type:
-
-```sh
-podman exec --user=0 -it CONTAINER bash
-```
-
-You will then be running bash with `root` privilege in the container, and you can use `apt-get` or whatever tools you need, and it will affect the environment of the user-level `container_shell` above. Do not precede the commands with `sudo` as you are already `root`. And remember that you are in an **Ubuntu** instance.
-
-**Note**: Your changes will not persist once both shells have been exited.
-
-Type `exit` on both shells once you have determined how to solve your problem.
-
-## Adding Packages to the Build
-
-The default **Containerfile**, `podman/redox-base-containerfile`, imports all required packages for a normal Redox build.
-
-However, you cannot easily add packages after the **base image** is created. You must add them to your own Containerfile. 
-
-Copy `podman/redox-base-containerfile` and add to the list of packages in the initial `apt-get`.
-
-Then, edit `mk/config.mk`, and change the variable **CONTAINERFILE** to point to your Containerfile, e.g.
-```
-CONTAINERFILE?=podman/my-containerfile
-```
-
-If your Containerfile is newer than `build/container.tag`, a new **image** will be created. You can force the image to be rebuilt with `make container_clean`.
-
-If you feel the need to have more than one **image**, you can change the variable **IMAGE_TAG** in `mk/podman.mk` to give the image a different name.
-
-## Summary of Podman-related Make Targets and Podman Commands
-
-- `make build/container.tag`: If no container image has been built, build one. It's not necessary to do this, it will be done when needed.
-
-- `make container_touch`: If a container image already exists, but there is no *tag* file, create the *tag* file so a new image is not built.
-
-- `make container_clean`: Remove the container image and the *tag* file.
-
-- `make container_shell`: Start an interactive `bash` shell in the same environment used by `make`.
-
-- `podman exec --user=0 -it CONTAINER bash`: Use this command in combination with `make container_shell` to get root access to the normal build environment, so you can temporarily add packages to the environment. `CONTAINER` is the name of the active container as shown by `podman ps`. For temporary, debugging purposes only.
-
-- `podman system reset`: Use this command when `make container_clean` is not sufficient to solve problems caused by errors in the container image. It will remove all images, use with caution. If you are using **Podman** for any other purpose, those images will be deleted as well.
-
-## Gory Details
-
-If you are interested in how we are able to use your working directory for builds in **Podman**, the following configuration details may be interesting.
-
-We are using **Rootless Podman**'s `--userns keep-id` feature. Because **Podman** is being run **Rootless**, the *container's* `root` user is actually mapped to your User ID on the host. Without the `keep-id` option, a regular user in the container maps to a phantom user outside the container. With the `keep-id` option, a user in the container that has the same User ID as your host User ID, will have the same permissions as you.
-
-During the creation of the **base image**, **Podman** invokes **Buildah**. **Buildah** does not allow User IDs to be shared between the host and the container in the same way that **Podman** does. So the **base image** is created without `keep-id`, then the first container created from the image, with `keep-id` enabled, triggers a remapping. Once that remapping is done, it is reused for each subsequent container.
-
-The working directory is made available in the container by **mounting** it as a **volume**. The **Podman** option 
-```
---volume "`pwd`":$(CONTAINER_WORKDIR):Z
-```
-takes the directory that `make` was started in as the host working directory, and **mounts** it at the location `$CONTAINER_WORKDIR`, normally set to `/mnt/redox`. The `:Z` at the end of the name indicates that the mounted directory should not be shared between simultaneous container instances. It is optional on some Linux distros, and not optional on others.
-
-For our invocation of Podman, we set the PATH environment variable as an option to `podman run`. This is to avoid the need for our `make` command to run `.bashrc`, which would add extra complexity. The `ARCH`, `CONFIG_NAME` and `FILESYSTEM_CONFIG` variables are passed in the environment to allow you to override the values in `mk/config.mk`, e.g. by setting them on your `make` command line or by using `build.sh`.
-
-We also set `PODMAN_BUILD=0` in the environment, to ensure that the instance of `make` running in the container knows not to invoke **Podman**. This overrides the value set in `mk/config.mk`.
-
-In the **Containerfile**, we use as few `RUN` commands as possible, as **Podman** commits the image after each command. And we use `CMD` rather than `ENTRYPOINT` to allow us to specify the command to run as a list of arguments, rather than just a string to be processed as a command by the entrypoint shell.
-
-Containers in our build process are run with `--rm` to ensure the container is discarded after each use. This prevents a proliferation of used containers. However, when you use `make container_clean`, you may notice multiple items being deleted. These are the partial images created as each `RUN` command is executed while building.
-
-Container images and container data is normally stored in the directory `$HOME/.local/share/containers/storage`. The command
-```sh
-podman system reset
-```
-removes that directory in its entirety. However, the contents of any **volume** are left alone.

podman/redox-base-containerfile

@@ -12,30 +12,46 @@ RUN apt-get update \
         curl \
         file \
         flex \
-        fuse \
+        fuse3 \
         genisoimage \
         git \
         gperf \
         libc6-dev-i386 \
         libexpat-dev \
         libfuse-dev \
+        libfuse3-dev \
         libgmp-dev \
         libhtml-parser-perl \
-        libpng-dev \
         libtool \
+        libfontconfig1-dev \
+        libpng-dev \
+        libjpeg-dev \
+        libsdl2-ttf-dev \
+        libsdl1.2-dev \
         m4 \
         nasm \
         pkg-config \
         po4a \
         syslinux-utils \
         texinfo \
-        libsdl1.2-dev \
         ninja-build \
         meson \
         python3-mako \
         xxd \
         rsync \
-        wget
+        wget \
+        python3 \
+		make \
+		xdg-utils \
+		zip \
+		unzip \
+		llvm \
+		clang \
+		perl \
+        doxygen \
+        ant \
+        protobuf-compiler \
+        intltool
 
 # _UID_ must be replaced with the user's uid on host
 # podman root is mapped to your user id on host during build,

podman/rustinstall.sh

@@ -4,4 +4,5 @@
 
 curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
 cargo install --force --version 0.1.1 cargo-config
-cargo install --force --version 0.3.20 xargo
+cargo install --force --version 1.16.0 just
+cargo install --force --version 0.26.0 cbindgen

podman_bootstrap.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -e
+
 ##########################################################
 # This function is simply a banner to introduce the script
 ##########################################################
@@ -13,10 +15,10 @@ banner()
 
 ###################################################################################
 # This function takes care of installing a dependency via package manager of choice
-# for building redox on BSDs (MacOS, FreeBSD, etc.).
+# for building Redox on BSDs (macOS, FreeBSD, etc.).
 # @params:    $1 package manager
-#            $2 package name
-#            $3 binary name (optional)
+#             $2 package name
+#             $3 binary name (optional)
 ###################################################################################
 install_bsd_pkg()
 {
@@ -58,14 +60,14 @@ install_freebsd_pkg()
 
 ###############################################################################
 # This function checks which of the supported package managers
-# is available on the OSX Host.
+# is available on the macOS host.
 # If a supported package manager is found, it delegates the installing work to
 # the relevant function.
 # Otherwise this function will exit this script with an error.
 ###############################################################################
 osx()
 {
-    echo "Detected OSX!"
+    echo "Detected macOS!"
 
     if [ ! -z "$(which brew)" ]; then
         osx_homebrew $@
@@ -81,24 +83,27 @@ osx()
 
 ###############################################################################
 # This function takes care of installing all dependencies using MacPorts
-# for building redox on Mac OSX
-# @params:    $1 the emulator to install, virtualbox or qemu
+# for building Redox on macOS
+# @params:    $1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 osx_macports()
 {
-    echo "Macports detected! Now updating..."
+    echo "MacPorts detected! Now updating..."
     sudo port -v selfupdate
 
     echo "Installing missing packages..."
 
     install_macports_pkg "git"
-    install_macports_pkg "cmake"
 
-    if [ "$1" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
         install_macports_pkg "qemu" "qemu-system-x86_64"
-    else
+	elif [ "$1" == "virtualbox" ]; then
         install_macports_pkg "virtualbox"
-    fi
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
 
     install_macports_pkg "osxfuse"
 	install_macports_pkg "podman"
@@ -106,8 +111,8 @@ osx_macports()
 
 ###############################################################################
 # This function takes care of installing all dependencies using Homebrew
-# for building redox on Mac OSX
-# @params:    $1 the emulator to install, virtualbox or qemu
+# for building Redox on macOS
+# @params:    $1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 osx_homebrew()
 {
@@ -118,11 +123,15 @@ osx_homebrew()
 
     install_brew_pkg "git"
 
-    if [ "$1" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
         install_brew_pkg "qemu" "qemu-system-x86_64"
-    else
+    elif [ "$1" == "virtualbox" ]; then
         install_brew_pkg "virtualbox"
-    fi
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
 
     install_brew_pkg "make"
 	install_brew_pkg "podman"
@@ -130,43 +139,50 @@ osx_homebrew()
 
 ###############################################################################
 # This function takes care of installing all dependencies using pkg
-# for building redox on FreeBSD
-# @params:    $1 the emulator to install, virtualbox or qemu
+# for building Redox on FreeBSD
+# @params:    $1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 freebsd()
 {
-    set -xe
+    set -x
     echo "FreeBSD detected!"
     echo "Installing missing packages..."
 
     install_freebsd_pkg "git"
 
-    if [ "$1" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
         install_freebsd_pkg "qemu" "qemu-system-x86_64"
-    else
+    elif [ "$1" == "virtualbox" ]; then
         install_freebsd_pkg "virtualbox"
-    fi
+    else
+	   echo "Unknown emulator: $1"
+	   exit 1
+	fi
 
     install_freebsd_pkg "gmake"
     install_freebsd_pkg "podman"
-    set +xe
+    set +x
 }
 
 ###############################################################################
-# This function takes care of installing all dependencies for building redox on
-# Arch linux
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# Arch Linux
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 archLinux()
 {
+
 	echo "Detected Arch Linux"
 	packages="git podman fuse"
 	if [ "$1" == "qemu" ]; then
 		packages="$packages qemu"
 	elif [ "$1" == "virtualbox" ]; then
 		packages="$packages virtualbox"
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
-
 	# Scripts should not cause a system update in order to just install a couple
 	#   of packages. If pacman -S --needed is going to fail, let it fail and the
 	#   user will figure out the issues (without updating if required) and rerun
@@ -176,12 +192,13 @@ archLinux()
 
 	echo "Installing packages $packages..."
 	sudo pacman -S --needed $packages
+	
 }
 
 ###############################################################################
-# This function takes care of installing all dependencies for building redox on
-# debian based linux
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# Debian-based Linux
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 # 		$2 the package manager to use
 ###############################################################################
 ubuntu()
@@ -200,20 +217,33 @@ ubuntu()
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Installing Virtualbox..."
-			sudo "$2" install virtualbox
+
+			if grep '^ID=debian$' /etc/os-release > /dev/null; then
+				echo "Virtualbox is not in the official debian packages"
+				echo "To install virtualbox on debian, see https://wiki.debian.org/VirtualBox"
+				echo "Please install VirtualBox and re-run this script,"
+				echo "or run with -e qemu"
+				exit 1
+			else
+				echo "Installing VirtualBox..."
+				sudo "$2" install virtualbox
+			fi
 		else
-			echo "Virtualbox already installed!"
+			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+
 }
 
 ###############################################################################
-# This function takes care of installing all dependencies for building redox on
-# fedora linux
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# Fedora Linux
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 fedora()
 {
@@ -222,6 +252,7 @@ fedora()
 		echo "Installing git..."
 		sudo dnf install git-all
 	fi
+
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Installing QEMU..."
@@ -229,14 +260,19 @@ fedora()
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Installing virtualbox..."
-			sudo dnf install virtualbox
+			echo "Please install VirtualBox and re-run this script,"
+			echo "or run with -e qemu"
+			exit 1
 		else
-			echo "Virtualbox already installed!"
+			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+		
 	# Use rpm -q <package> to check if it's already installed
 	PKGS=$(for pkg in podman; do rpm -q $pkg > /dev/null || echo $pkg; done)
 	# If the list of packages is not empty, install missing
@@ -248,41 +284,100 @@ fedora()
 }
 
 ###############################################################################
-# This function takes care of installing all dependencies for building redox on
-# *suse linux
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# *SUSE Linux
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ###############################################################################
 suse()
 {
 	echo "Detected SUSE Linux"
+
+	packages=(
+		"make"
+		"fuse-devel"
+		"podman"
+	)
+
 	if [ -z "$(which git)" ]; then
-		echo "Installing git..."
-		zypper install git
+		echo "Will install git ..."
+		packages+=(git)
 	fi
+
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
-			echo "Installing QEMU..."
-			sudo zypper install qemu-x86 qemu-kvm
+			echo "Will install QEMU..."
+			packages+=(qemu-x86 qemu-kvm)
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Please install Virtualbox and re-run this script,"
+			echo "Please install VirtualBox and re-run this script,"
 			echo "or run with -e qemu"
-			exit
+			exit 1
 		else
-			echo "Virtualbox already installed!"
+			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+	
 	echo "Installing necessary build tools..."
-	sudo zypper install make fuse-devel podman
+
+	# We could install all the packages in a single zypper command with:
+	#
+	#        zypper install package1 package2 package3
+	# 
+	# But there is an issue with this: zypper returns a success code if at
+	# least one of the packages was correctly installed, but we need it to fail
+	# if any of the packages is missing.
+	#
+	# To confirm that the packages are available, we try to install them one by
+	# one with --dry-run.
+	# We still install all the packages in a single zypper command so that the
+	# user has to confirm only once.
+	for p in ${packages[@]}; do
+		if rpm -q "${p}" > /dev/null ; then
+		   echo "${p} is already installed"
+		else
+		   # Zypper shows a confirmation prompt and the "y" answer even with 
+		   # --non-interactive and --no-confirm:
+		   #
+		   #   1 new package to install.
+           #   Overall download size: 281.7 KiB. Already cached: 0 B. After the operation, additional 394.6 KiB will be used.
+           #   Continue? [y/n/v/...? shows all options] (y): y
+		   #
+		   # That could make the user think that the package was installed, 
+		   # when it was only a dry run.
+		   # To avoid the confusion, we hide the output unless there was an
+		   # error.
+		   if out="$(zypper --non-interactive install --no-confirm --dry-run --force-resolution ${p}  2>&1)"  ; then
+		      echo "${p} can be installed"
+		   else
+		   	  echo "no"
+			  echo ""
+		      echo "Zypper output:"
+			  echo ""
+			  echo "${out}"
+			  echo ""
+		      echo "Could not find how to install '${p}', try running:"
+			  echo ""
+			  echo "     zypper install ${p}"
+			  echo ""
+			  exit 1
+		   fi
+		fi
+	done
+
+	zypper install ${packages[@]}
+
 }
 
 ##############################################################################
-# This function takes care of installing all dependencies for building redox on
-# gentoo linux
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# Gentoo Linux
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ##############################################################################
 gentoo()
 {
@@ -291,36 +386,51 @@ gentoo()
 		echo "Installing git..."
 		sudo emerge dev-vcs/git
 	fi
-	if [ -z "$(which fusermount)" ]; then
+	if [ -z "$(which fusermount 2>/dev/null)" ] && [ -z "$(which fusermount3 2>/dev/null)" ]; then
 		echo "Installing fuse..."
 		sudo emerge sys-fs/fuse
 	fi
-	if [ "$2" == "qemu" ]; then
+
+	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
 			echo "Please install QEMU and re-run this script"
 			echo "Step1. Add QEMU_SOFTMMU_TARGETS=\"x86_64\" to /etc/portage/make.conf"
 			echo "Step2. Execute \"sudo emerge app-emulation/qemu\""
+            exit 1
 		else
 			echo "QEMU already installed!"
 		fi
+	elif [ "$1" == "virtualbox" ]; then
+		if [ -z "$(which virtualbox)" ]; then
+			echo "Please install VirtualBox and re-run this script,"
+			echo "or run with -e qemu"
+			exit 1
+		else
+			echo "VirtualBox already installed!"
+		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
+
 	if [ -z "$(which cmake)" ]; then
 		echo "Installing cmake..."
 		sudo emerge dev-util/cmake
 	fi
 	if [ -z "$(which podman)" ]; then
 		echo "Please install Podman, https://wiki.gentoo.org/wiki/Podman"
+		exit 1
 	fi
 }
 
 ##############################################################################
-# This function takes care of installing all dependencies for building redox on
-# SolusOS
-# @params:	$1 the emulator to install, virtualbox or qemu
+# This function takes care of installing all dependencies for building Redox on
+# Solus
+# @params:	$1 the emulator to install, "virtualbox" or "qemu"
 ##############################################################################
 solus()
 {
-	echo "Detected SolusOS"
+	echo "Detected Solus"
 
 	if [ "$1" == "qemu" ]; then
 		if [ -z "$(which qemu-system-x86_64)" ]; then
@@ -328,14 +438,17 @@ solus()
 		else
 			echo "QEMU already installed!"
 		fi
-	else
+	elif [ "$1" == "virtualbox" ]; then
 		if [ -z "$(which virtualbox)" ]; then
-			echo "Please install Virtualbox and re-run this script,"
+			echo "Please install VirtualBox and re-run this script,"
 			echo "or run with -e qemu"
-			exit
+			exit 1
 		else
-			echo "Virtualbox already installed!"
+			echo "VirtualBox already installed!"
 		fi
+	else
+	   echo "Unknown emulator: $1"
+	   exit 1
 	fi
 
 	echo "Installing necessary build tools..."
@@ -343,6 +456,7 @@ solus()
 	sudo eopkg it fuse-devel git make fuse2-devel rsync
 	if [ -z "$(which podman)" ]; then
 		echo "Please install Podman"
+		exit 1
 	fi
 }
 
@@ -423,6 +537,8 @@ boot()
 {
 	echo "Cloning gitlab repo..."
 	git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive
+	echo "Creating .config with PODMAN_BUILD=1"
+	echo 'PODMAN_BUILD?=1' > redox/.config
 	echo "Cleaning up..."
 	rm podman_bootstrap.sh
 	echo
@@ -430,21 +546,18 @@ boot()
 	echo "Well it looks like you are ready to go!"
 	echo "---------------------------------------"
 	statusCheck
+	echo "The file redox/.config was created with PODMAN_BUILD=1."
 	echo "Run the following commands to build redox using Podman:"
 	echo
 	echo "cd redox"
 	MAKE="make"
 	if [[ "$(uname)" == "FreeBSD" ]]; then
     	MAKE="gmake"
-    	echo "kldload fuse.ko # This loads the kernel module for fuse"
+    	echo "kldload fuse.ko # This loads the kernel module for FUSE"
     fi
-	echo "export PODMAN_BUILD=1"
 	echo "$MAKE all"
 	echo "$MAKE virtualbox or qemu"
 	echo
-	echo "You can also edit mk/config.mk and change PODMAN_BUILD to 1 so"
-	echo "you don't need to specify it on the command line."
-	echo
 	echo "      Good luck!"
 
 	exit
@@ -475,7 +588,7 @@ do
 		u) update=true;;
 		h) usage;;
 		s) statusCheck && exit;;
-		\?) echo "I don't know what to do with that option, try -h for help"; exit;;
+		\?) echo "I don't know what to do with that option, try -h for help"; exit 1;;
 	esac
 done
 
@@ -492,7 +605,7 @@ if [ "Darwin" == "$(uname -s)" ]; then
 else
 	# Here we will use package managers to determine which operating system the user is using.
 
-	# Suse and derivatives
+	# SUSE and derivatives
 	if hash 2>/dev/null zypper; then
 		suse "$emulator"
 	# Debian or any derivative of it
@@ -504,10 +617,10 @@ else
 	# Gentoo
 	elif hash 2>/dev/null emerge; then
 		gentoo "$emulator"
-	# SolusOS
+	# Solus
 	elif hash 2>/dev/null eopkg; then
 		solus "$emulator"
-	# Arch linux
+	# Arch Linux
 	elif hash 2>/dev/null pacman; then
 		archLinux "$emulator"
 	# FreeBSD
@@ -515,7 +628,7 @@ else
 		freebsd "$emulator"
 	# Unsupported platform
 	else
-    	printf "\e[31;1mFatal error: \e[0;31mUnsupported platform, please open an issue\[0m"
+    	printf "\e[31;1mFatal error: \e[0;31mUnsupported platform, please open an issue\e[0m\n"
 	fi
 fi
 
@@ -523,4 +636,4 @@ if [ "$dependenciesonly" = false ]; then
 	boot
 fi
 
-echo "Redox bootstrap complete!"
+echo "Redox bootstrap complete!"

redoxfs

@@ -1 +1 @@
-Subproject commit 9fc80c8bf680557ae8c5e3049bb84d591674170f
+Subproject commit 14a07dc268ec41db87d4f453022ac8805b918d20

relibc

@@ -1 +1 @@
-Subproject commit ee0193aa7e9d0900f6c9824aa860b3750a27364a
+Subproject commit 65589f9c935a7eaaa2d1d8db4875fbb458b29edd

rust

@@ -1 +1 @@
-Subproject commit 3e6631a06e70dde4f8fd2069c199a5be8c0185ca
+Subproject commit e9ed31b0540da8c7eae71de353a741294139ae8b

rust-toolchain

@@ -1 +0,0 @@
-nightly-2022-03-18

rust-toolchain.toml

@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2023-09-07"
+components = ["rust-src"]

scripts/backtrace.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+
+usage()
+{
+    echo "Usage: $0 -r recipe [ -e command_name ] [ -R ] [ -X | -6 | -A ] [[ -b backtracefile ] | [ addr1 ... ]]"
+    echo
+    echo "Print the backtrace contained in the backtracefile."
+    echo "Symbols are taken from the executable for the given recipe."
+    echo "If no backtracefile is given, decode the given addresses instead."
+    echo "This command must be run in the 'redox' directory."
+    echo
+    echo "-X for x86_64, -6 for i686, -A for aarch64 (x86_64 is the default)."
+    echo "To read from stdin, use '-b -'"
+    echo "The name of the executable must match what Cargo believes it to be."
+    echo "If the executalbe is named 'recipe_command', just use 'command' as the name."
+    echo "The debug version of the executable is used if available."
+    echo "The release version is used if no debug version exists."
+    echo "-R to force the use of the 'release' version of the executable."
+    echo "Make sure the executable is the one that produced the backtrace."
+    exit 1
+}
+
+ARCH="x86_64"
+
+while getopts ":b:e:r:hRXA6" opt
+do
+    case "$opt" in
+        X) ARCH="x86_64";;
+        A) ARCH="aarch64";;
+        6) ARCH="i686";;
+        b) INFILE="$OPTARG";;
+        e) COMMAND="$OPTARG";;
+        i) INST="$OPTARG";;
+        r) RECIPE_NAME="$OPTARG";;
+        R) RELEASE=true;;
+	h) usage;;
+	\?) echo "Unknown option -$OPTARG, try -h for help"; exit;;
+        :) echo "-$OPTARG requires a value"; exit;;
+	esac
+done
+shift $((OPTIND -1))
+
+if [ -z "$RECIPE_NAME" ]
+then
+    usage
+fi
+
+if [ -z "$INFILE" -a $# = 0 ]
+then
+    usage
+fi
+
+# if no command name is given, assume it's the same as the recipe name
+RECIPE_DIR="$(cd cookbook; target/release/find_recipe $RECIPE_NAME)"
+if [ -z "$COMMAND" ]
+then
+    COMMAND="$RECIPE_NAME"
+fi
+
+# look for the debug version of the command
+EXECUTABLE=cookbook/"$RECIPE_DIR"/target/"$ARCH"-unknown-redox/build/target/"$ARCH"-unknown-redox/debug/"$COMMAND"
+
+# try the release version next
+if [ ! -f "$EXECUTABLE" -o ! -z "$RELEASE" ]
+then
+    EXECUTABLE=cookbook/"$RECIPE_DIR"/target/"$ARCH"-unknown-redox/build/target/"$ARCH"-unknown-redox/release/"$COMMAND"
+fi
+
+if [ $# -ne 0 ]
+then
+    addr2line --demangle=rust --inlines --pretty-print --functions --exe="$EXECUTABLE" $@
+else
+    sed '/^\s*$/d; s/^.*0x\([0-9a-f]*\).*$/\1/g' "$INFILE" | addr2line --demangle=rust --inlines --pretty-print --functions --exe="$EXECUTABLE"
+fi
+

scripts/category.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+if [ -z "$1" ] || [ -z "$2" ]
+then
+    echo "Build or clean all recipe directories in a category" >&2
+    echo Usage: $0 "<action>" "<recipe-category>" >&2
+    echo "<action>" can be f, r, c, u, or combinations that \"make\" understands >&2
+    exit 1
+fi
+
+set -x
+
+action="${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

scripts/changelog.sh

@@ -12,7 +12,7 @@ REPOS=(
     rust=rust
 )
 
-for package in $(installer/target/release/redox_installer --list-packages -c config/x86_64/desktop.toml)
+for package in $(installer/target/release/redox_installer --list-packages -c config/$(uname -m)/desktop.toml)
 do
     REPOS+=("${package}=cookbook/recipes/${package}/source")
 done

scripts/commit-hash.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+if [ $# -ne 1 ]
+then
+    echo "Usage: $0 recipe_name"
+    echo "  Print the commit hash for recipe_name"
+    exit 1
+fi
+
+cd cookbook
+recipe_path="$(target/release/find_recipe $1)"
+
+cd "$recipe_path"/source
+git branch -v

scripts/dual-boot.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [ -n "$1" ]
+then
+    DISK="$1"
+else
+    DISK=/dev/disk/by-partlabel/REDOX_INSTALL
+fi
+
+if [ ! -b "${DISK}" ]
+then
+    echo "$0: '${DISK}' is not a block device" >&2
+    exit 1
+fi
+
+if [ -z "${ARCH}" ]
+then
+    export ARCH=x86_64
+fi
+
+if [ -z "${CONFIG_NAME}" ]
+then
+    export CONFIG_NAME=demo
+fi
+
+IMAGE="build/${ARCH}/${CONFIG_NAME}/filesystem.img"
+set -x
+make "${IMAGE}"
+sudo popsicle "${IMAGE}" "${DISK}"
+set +x
+
+ESP="$(bootctl --print-esp-path)"
+if [ -z "${ESP}" ]
+then
+    echo "$0: no ESP found" >&2
+    exit 1
+fi
+
+BOOTLOADER="cookbook/recipes/core/bootloader/target/${ARCH}-unknown-redox/stage/boot/bootloader.efi"
+set -x
+sudo mkdir -pv "${ESP}/EFI" "${ESP}/loader/entries"
+sudo cp -v "${BOOTLOADER}" "${ESP}/EFI/redox.efi"
+sudo tee "${ESP}/loader/entries/redox.conf" <<EOF
+title Redox OS
+efi /EFI/redox.efi
+EOF
+set +x
+
+sync
+
+echo "Finished installing Redox OS dual boot"

scripts/find-recipe.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# Ensure arch and config are set as desired, we use these to find the build dir
+export ARCH=$(uname -m)
+export CONFIG_NAME=desktop
+
+# Make sure to unmount the image first
+make unmount &>/dev/null || true
+
+# Mount the image
+make mount >/dev/null
+
+# Find all files
+find "build/${ARCH}/${CONFIG_NAME}/" -type f | cut -d / -f5- |\
+sort |\
+uniq |\
+while read path
+do
+    # Skip empty paths
+    if [ -z "${path}" ]
+    then
+        continue
+    fi
+
+    # Find all packages providing this file
+    pkgs="$(
+        find cookbook/recipes/*"/target/${ARCH}-unknown-redox/stage/${path}" 2>/dev/null |
+        cut -d/ -f3 |
+        tr '\n' ' ' |
+        sort |
+        uniq
+    )"
+    if [ -n "${pkgs}" ]
+    then
+        echo "$path: ${pkgs}"
+    else
+        echo "$path: no packages, see config/${ARCH}/${CONFIG_NAME}.toml"
+    fi
+done
+
+# Make sure to unmount the image
+make unmount &>/dev/null || true

scripts/include-recipes.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Given a string, find recipe.toml files containing that string.
+# Create a list that can be copy/pasted into a filesystem config.
+
+if [ -z "$*" ]
+then
+    echo "Find matching recipes, and format for inclusion in config"
+    echo "Usage: $0 \"pattern\""
+    echo "Must be run from 'redox' directory"
+    echo "e.g. $0 \"TODO.*error\""
+    exit 1
+fi
+
+cookbook_recipes="cookbook/recipes"
+recipe_paths=$(grep -rl "$*" "$cookbook_recipes" --include recipe.toml)
+
+for recipe_path in $recipe_paths
+do
+    recipe_dir="$(dirname $recipe_path)"
+    recipe_name="$(basename $recipe_dir)"
+    echo "$recipe_name = {}    # " $(grep "$*" $recipe_path)
+done

scripts/pkg-size.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+if [ $# = 0 ]
+then
+    find cookbook/recipes \( -name stage.pkgar -o -name stage.tar.gz \) -exec ls -hs {} \;
+    exit 0
+fi
+
+for recipe in $@
+do
+    if [ "$recipe" = "-h" ] || [ "$recipe" = "--help" ]
+    then
+        echo "Usage: $0 [recipe] ..."
+        echo "       For the recipe(s), prints the size of 'stage.pkgar' and 'stage.tar.gz'."
+        echo "       If no recipe is given, then all packages are listed."
+        exit 0
+    fi
+
+    recipe_paths=$(find cookbook/recipes -name $recipe)
+    for recipe_path in $recipe_paths
+    do
+        if [ -f "$recipe_path/recipe.toml" ] || [ -f "$recipe_path/recipe.sh" ]
+        then
+            find "$recipe_path" \( -name stage.pkgar -o -name stage.tar.gz \) -exec ls -hs {} \;
+        fi
+    done
+done

scripts/show-package.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Show the contents of the stage and sysroot folders in some recipe
+
+if [ -z "$*" ]
+then
+    echo "Show the contents of the stage and sysroot folders in recipe(s)"
+    echo "Usage: $0 recipe1 ..."
+    echo "Must be run from the 'redox' directory"
+    echo "e.g. $0 kernel"
+    exit 1
+fi
+
+find_recipe="target/release/find_recipe"
+if [ ! -x "cookbook/$find_recipe" ]
+then
+    echo "$find_recipe not found."
+    echo "Please run 'make fstools' and try again."
+    exit 1
+fi
+
+for recipe in $*
+do
+    recipe_dir="$(cd cookbook; "$find_recipe" "$recipe")"
+    ls -1 "cookbook/$recipe_dir/target"/*/{stage,sysroot}
+done

scripts/ventoy.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+set -e
+
+ARCHS=(
+    i686
+    x86_64
+)
+CONFIGS=(
+    demo
+    desktop
+)
+
+VENTOY="/media/${USER}/Ventoy"
+if [ ! -d "${VENTOY}" ]
+then
+    echo "Ventoy not mounted" >&2
+    exit 1
+fi
+
+for ARCH in "${ARCHS[@]}"
+do
+    for CONFIG_NAME in "${CONFIGS[@]}"
+    do
+        IMAGE="build/${ARCH}/${CONFIG_NAME}/livedisk.iso"
+        make ARCH="${ARCH}" CONFIG_NAME="${CONFIG_NAME}" "${IMAGE}"
+        cp -v "${IMAGE}" "${VENTOY}/redox-${CONFIG_NAME}-${ARCH}.iso"
+    done
+done
+
+sync
+
+echo "Finished copying configs (${CONFIGS[@]}) for archs (${ARCHS[@]})"