From 3dfbcf314be654f88f191b5d44d928874b564799 Mon Sep 17 00:00:00 2001 From: Ron Williams Date: Tue, 7 May 2024 23:08:59 -0700 Subject: [PATCH 1/2] Improve README for visitors who arrive at our GitHub mirror --- README.md | 62 +++++++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 67be66e..721661b 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,27 @@ Redox

-[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. +This repository is the **Build System** for Redox OS. Redox is under active development by a vibrant community. Key links: -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 **main website** for Redox OS](https://www.redox-os.org). +- [The Redox Book](https://doc.redox-os.org/book/) and [Build Instructions](https://doc.redox-os.org/book/ch02-05-building-redox.html). +- [Redox Chat and Support](https://matrix.to/#/#redox-join:matrix.org). +- [Patreon](https://www.patreon.com/redox_os), [Donate](https://redox-os.org/donate/) and [Merch](https://redox-os.creator-spring.com/). +- Scroll down for a list of key Redox components and their repos. + +[Redox](https://www.redox-os.org) is an operating system written in Rust, a language with focus on safety, efficiency and high performance. Redox uses a microkernel architecture, and 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 components (file system, display manager, core utilities, etc.) that together make up a functional and convenient operating system. Redox uses the COSMIC desktop apps, and provides source code compatibility with many Rust, Linux and BSD programs. [![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) -## Guide - -This is the main repository of the Redox GitLab where the build system files are stored, this README is used to guide new developers. - -You can find the most important pages below: +## More Links - [Book](https://doc.redox-os.org/book/) - [Contribute](CONTRIBUTING.md) - [Hardware Compatibility](HARDWARE.md) +- Run Redox in a [Virtual Machine](https://doc.redox-os.org/book/ch02-01-running-vm.html) or on [Real Hardware](https://doc.redox-os.org/book/ch02-02-real-hardware.html) - [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) @@ -26,42 +31,28 @@ You can find the most important pages below: ## Ecosystem -These are the most important repositories available on the Redox GitLab: +Some of the key repositories on the Redox GitLab: -| Name (lexicographic order) | Maintainer +| Essential Repos | 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** +| [Kernel](https://gitlab.redox-os.org/redox-os/kernel) | **@jackpot51** +| [RedoxFS (default filesystem)](https://gitlab.redox-os.org/redox-os/redoxfs) | **@jackpot51** +| [Drivers](https://gitlab.redox-os.org/redox-os/drivers) | **@jackpot51** | [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** +| [netstack (protocol stack)](https://gitlab.redox-os.org/redox-os/netstack) | **@jackpot51** +| [Ion (shell)](https://gitlab.redox-os.org/redox-os/ion) | **@jackpot51** +| [Termion (terminal library)](https://gitlab.redox-os.org/redox-os/termion) | **@jackpot51** +| This repo - the root of the Build System | **@jackpot51** +| [cookbook (Build System for components)](https://gitlab.redox-os.org/redox-os/cookbook) | **@jackpot51** **@hatred_45** +| [Redoxer (Build/Test for Redox compatibility verification)](https://gitlab.redox-os.org/redox-os/redoxer) | **@jackpot51** +| [The Redox Book](https://gitlab.redox-os.org/redox-os/book) | **@hatred_45** ## What it looks like +See [Redox in Action](https://www.redox-os.org/screens/) for photos and videos. + Redox Redox Redox @@ -70,4 +61,3 @@ These are the most important repositories available on the Redox GitLab: Redox Redox -See [Redox in Action](https://www.redox-os.org/screens/) for photos and videos. \ No newline at end of file From 17bedf539fd9fb9ad7e6cb887c33a036b3152a9c Mon Sep 17 00:00:00 2001 From: Forest0923 Date: Wed, 8 May 2024 19:52:07 +0900 Subject: [PATCH 2/2] Fix: Add rsync to dependent package list (Arch) --- bootstrap.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 596ace7..6adb7c3 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -350,7 +350,8 @@ archLinux() doxygen \ lua \ ant \ - protobuf" + protobuf \ + rsync" if [ "$1" == "qemu" ]; then packages="$packages qemu" @@ -526,7 +527,7 @@ fedora() echo "Unknown emulator: $1" exit 1 fi - + # Use rpm -q to check if it's already installed PKGS=$(for pkg in file \ autoconf \ @@ -668,13 +669,13 @@ suse() echo "Unknown emulator: $1" exit 1 fi - + echo "Installing necessary build tools..." # 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. @@ -687,14 +688,14 @@ suse() if rpm -q "${p}" > /dev/null ; then echo "${p} is already installed" else - # Zypper shows a confirmation prompt and the "y" answer even with + # 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, + # 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.