diff --git a/Cargo.lock b/Cargo.lock index f0142794e..58ee056fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#67af2b7543ff8fb2eaba6699ac9d331dfe2d0f8c" +source = "git+https://gitlab.redox-os.org/willnode/redoxer.git?branch=linux#bdc5b9f2e37b4539698035255a312c16252b1845" dependencies = [ "anyhow", "dirs", diff --git a/Cargo.toml b/Cargo.toml index 54479d5fb..452355c64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ pkgar-core = { git = "https://gitlab.redox-os.org/redox-os/pkgar.git" } pkgar-keys = { git = "https://gitlab.redox-os.org/redox-os/pkgar.git" } redox-pkg = { git = "https://gitlab.redox-os.org/redox-os/pkgutils.git", default-features = false } redox_installer = { git = "https://gitlab.redox-os.org/redox-os/installer.git", default-features = false } -redoxer = { git = "https://gitlab.redox-os.org/redox-os/redoxer.git", default-features = false } +redoxer = { git = "https://gitlab.redox-os.org/willnode/redoxer.git", branch = "linux", default-features = false } regex = "1.11" serde = { version = "=1.0.197", features = ["derive"] } termion = "4" diff --git a/config/dev.toml b/config/dev.toml index 8f92fb2cc..cddb680a8 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -5,11 +5,11 @@ include = ["desktop.toml"] # General settings [general] # Filesystem size in MiB -filesystem_size = 20000 +filesystem_size = 3000 # Do not prompt if settings are not defined prompt = false # Package settings [packages] -dev-redox = {} +gcc13 = {} hello-redox = {} diff --git a/mk/config.mk b/mk/config.mk index 0d8484057..4f69b3418 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -7,6 +7,8 @@ HOST_ARCH?=$(shell uname -m) # Configuration ## Architecture to build Redox for (aarch64, i586, or x86_64). Defaults to a host one ARCH?=$(HOST_ARCH) +## Operating system mode (redox or linux). Linux is experimental +OPERATING_SYSTEM?=redox ## Sub-device type for aarch64 if needed BOARD?= ## Enable to use binary prefix (much faster) @@ -158,7 +160,11 @@ endif endif ## Userspace variables -ifeq ($(ARCH),riscv64gc) +ifeq ($(OPERATING_SYSTEM),linux) + export TARGET=$(ARCH)-unknown-linux-musl + export GNU_TARGET=$(ARCH)-unknown-linux-musl + export USE_RUST_LIBM=1 +else ifeq ($(ARCH),riscv64gc) export TARGET=riscv64gc-unknown-redox export GNU_TARGET=riscv64-unknown-redox else diff --git a/recipes/core/relibc/recipe.toml b/recipes/core/relibc/recipe.toml index 4aba45310..53ccb3bee 100644 --- a/recipes/core/relibc/recipe.toml +++ b/recipes/core/relibc/recipe.toml @@ -1,5 +1,6 @@ [source] -git = "https://gitlab.redox-os.org/redox-os/relibc.git" +git = "https://gitlab.redox-os.org/willnode/relibc.git" +branch = "linux" [build] template = "custom"