Merge branch 'merge_base_repo' into 'master'

Draft: Update configs for the base repo See merge request redox-os/redox!1539
Fix typos on bootstrapping scripts
2026-07-01 00:58:42 +08:00 · 2025-03-17 06:50:27 +00:00 · 2025-03-15 17:10:59 +00:00 · 2025-03-13 13:12:20 -06:00 · 2025-03-13 12:21:52 -06:00 · 2025-03-12 16:02:38 -06:00
9 changed files with 9 additions and 13 deletions
--- a/config/aarch64/ci.toml
+++ b/config/aarch64/ci.toml
@ -12,6 +12,8 @@ atk = {}
 audiod = {}
 autoconf = {}
 automake = {}
+base = {}
+base-initfs = {}
 bash = {}
 binutils = {}
 bootloader = {}
@ -33,8 +35,6 @@ curl = {}
 dash = {}
 diffutils = {}
 dosbox = {}
-drivers = {}
-drivers-initfs = {}
 duktape = {}
 eduke32 = {}
 escalated = {}
--- a/config/base.toml
+++ b/config/base.toml
@ -12,7 +12,6 @@ prompt = false
 base = {}
 bootloader = {}
 bootstrap = {}
-drivers = {}
 escalated = {}
 initfs = {}
 kernel = {}
--- a/config/i686/ci.toml
+++ b/config/i686/ci.toml
@ -8,6 +8,7 @@ prompt = false
 # Package settings
 [packages]
 audiod = {}
+base = {}
 bootloader = {}
 bootstrap = {}
 ca-certificates = {}
@ -15,7 +16,6 @@ contain = {}
 coreutils = {}
 dash = {}
 diffutils = {}
-drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
--- a/config/net.toml
+++ b/config/net.toml
@ -5,7 +5,6 @@ include = ["base.toml"]

 # Package settings
 [packages]
-netstack = {}
 netutils = {}

 ## Network init
--- a/config/riscv64gc/ci.toml
+++ b/config/riscv64gc/ci.toml
@ -8,6 +8,7 @@ prompt = false
 # Package settings
 [packages]
 audiod = {}
+base = {}
 bootloader = {}
 bootstrap = {}
 ca-certificates = {}
@ -15,7 +16,6 @@ contain = {}
 coreutils = {}
 dash = {}
 diffutils = {}
-drivers = {}
 escalated = {}
 extrautils = {}
 findutils = {}
--- a/config/x86_64/ci.toml
+++ b/config/x86_64/ci.toml
@ -37,8 +37,6 @@ dash = {}
 dejavu = {}
 diffutils = {}
 dosbox = {}
-drivers = {}
-drivers-initfs = {}
 duktape = {}
 eduke32 = {}
 escalated = {}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit da8c350a8b5a8908879edcb1dc09b0297ec6bd95
+Subproject commit e20cfd50dd32964d446752605ad6803e2fbdd84e
--- a/native_bootstrap.sh
+++ b/native_bootstrap.sh
@ -1,9 +1,9 @@
+#!/usr/bin/env bash
+
 # This script setup the Redox build system
 # It install Rustup, the recipe dependencies for cross-compilation
 # and download the build system configuration files

-#!/usr/bin/env bash
-
 set -e

 ##########################################################
--- a/podman_bootstrap.sh
+++ b/podman_bootstrap.sh
@ -1,9 +1,9 @@
+#!/usr/bin/env bash
+
 # This script setup the Redox build system with Podman
 # It install the Podman dependencies, Rustup, recipes dependencies for cross-compilation
 # and download the build system configuration files

-#!/usr/bin/env bash
-
 set -e

 ##########################################################
Author	SHA1	Message	Date
bjorn3	f5fc8e7c37	Merge branch 'merge_base_repo' into 'master' Draft: Update configs for the base repo See merge request redox-os/redox!1539	2025-03-17 06:50:27 +00:00
Ribbon	37395f5184	Fix typos on bootstrapping scripts	2025-03-15 17:10:59 +00:00
Jeremy Soller	7e0de63424	Update cookbook	2025-03-13 13:12:20 -06:00
Jeremy Soller	5c452549e1	Update cookbook	2025-03-13 12:21:52 -06:00
Jeremy Soller	c6396c5a42	Update cookbook	2025-03-12 16:02:38 -06:00
Jeremy Soller	ad11d98fdd	Merge branch 'move_netstack_base' into 'master' Remove netstack package dependency See merge request redox-os/redox!1564	2025-03-12 22:01:44 +00:00
bjorn3	9d498c6aad	Remove netstack package dependency It has been merged into the base package	2025-03-10 21:32:11 +01:00
bjorn3	5008cc4430	Update configs for the base repo	2025-02-18 21:21:19 +01:00