mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-04 18:48:43 +08:00
Linux
This commit is contained in:
parent
6d774c117a
commit
ed1e074586
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -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",
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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 = {}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user