vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: vinzenz:7357d4aabfd926035349b3297252477436595406
Branches Tags
vinzenz:main
..
compare: vinzenz:8363ec046dedb72a91c1b27b26a5008478b5911c
Branches Tags
vinzenz:main

No commits in common. "7357d4aabfd926035349b3297252477436595406" and "8363ec046dedb72a91c1b27b26a5008478b5911c" have entirely different histories.
7357d4aabf ... 8363ec046d

9 changed files with 3 additions and 313 deletions
Show stats Expand all files Collapse all files

6
CONTRIBUTING.md
View file

@ -118,12 +118,6 @@ To start the compilation of the default recipes run the command below:
make all make all
``` ```
In case your operating system does not use SELinux, you must set the `USE_SELINUX` to `0` when calling `make all`, otherwise you might experience errors:
```sh
make all USE_SELINUX=0
```
You can find the build system organization and commands on the [Build System](https://doc.redox-os.org/book/build-system-reference.html) page. You can find the build system organization and commands on the [Build System](https://doc.redox-os.org/book/build-system-reference.html) page.
## Developer FAQ ## Developer FAQ

2
cookbook

@ -1 +1 @@
Subproject commit 9c54dacdf3dd063b9a497f223757821996ce9619 Subproject commit bff6ca4d6881ff295be995653feb94f5357e8e19

98
flake.lock
View file

@ -1,98 +0,0 @@
{
"nodes": {
"crane": {
"locked": {
"lastModified": 1739638817,
"narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=",
"owner": "ipetkov",
"repo": "crane",
"rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1739512841,
"narHash": "sha256-Zc+K4AxAwFaWKK18nSl/3TKidGf46En7bfK8SL+Revg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fada727ee7c0bd487e311dede0a2b0725a0f7765",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1739673031,
"narHash": "sha256-Z/GT8ebbvc4goxN4A0A5ACj26G1HaGJO+VetrPuC5Mo=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "538528d55318e0c8af1c307dcf10b7629b988fc3",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

179
flake.nix
View file

@ -1,179 +0,0 @@
# Podman needs to be installed and configured on the system for all this to work:
# https://nixos.wiki/wiki/Podman
{
description = "The Nix-flake for Redox development on NixOS";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
};
};
crane = {
url = "github:ipetkov/crane";
};
flake-utils.url = "github:numtide/flake-utils";
};
outputs = {
self,
nixpkgs,
flake-utils,
rust-overlay,
crane,
} @ inputs:
flake-utils.lib.eachSystem ["x86_64-linux" "aarch64-linux"] (system: let
overlays = [(import rust-overlay)];
pkgs = import nixpkgs {
inherit system overlays;
};
inherit (pkgs) lib;
rust-bin =
pkgs.rust-bin.nightly."2025-01-12".default.override
{
extensions = ["rust-analyzer" "rust-src"];
targets = ["x86_64-unknown-redox"];
};
rustPlatform = pkgs.makeRustPlatform {
cargo = rust-bin;
rustc = rust-bin;
};
# Podman config taken from https://nixos.wiki/wiki/Podman and https://gist.github.com/adisbladis/187204cb772800489ee3dac4acdd9947
# Provides a script that copies required files to ~/
podmanSetupScript = let
registriesConf = pkgs.writeText "registries.conf" ''
[registries.search]
registries = ['docker.io']
[registries.block]
registries = []
'';
in
pkgs.writeScript "podman-setup" ''
#!${pkgs.runtimeShell}
# Dont overwrite customised configuration
if ! test -f ~/.config/containers/policy.json; then
install -Dm555 ${pkgs.skopeo.src}/default-policy.json ~/.config/containers/policy.json
fi
if ! test -f ~/.config/containers/registries.conf; then
install -Dm555 ${registriesConf} ~/.config/containers/registries.conf
fi
systemctl --user start podman.socket || true
export PODMAN_SYSTEMD_UNIT=podman.socket
'';
# Provides a fake "docker" binary mapping to podman
dockerCompat = pkgs.runCommandNoCC "docker-podman-compat" {} ''
mkdir -p $out/bin
ln -s ${pkgs.podman}/bin/podman $out/bin/docker
'';
cargo-config = rustPlatform.buildRustPackage rec {
pname = "cargo-config";
version = "0.1.1";
src = pkgs.fetchFromGitHub {
owner = "wesleywiser";
repo = "cargo-config";
rev = "cf576faf65913615ed424914daa960800ed3ebc4";
sha256 = "sha256-HrITNTfjBppOH1MhfZHfzHc6N8ymcm7vaiBI94ctUOA=";
fetchSubmodules = true;
};
# useFetchCargoVendor = true; # this is recommended, but fails in some python code?
cargoHash = "sha256-yQpIKclZ8KLE5JGkB/tjKZA8ezaD9SbUthDsuBXYZjQ=";
};
buildInputs = with pkgs; [
# Compilation
rust-bin
# Utils
cowsay
lolcat
tokio-console
# Cargo utilities
bacon
cargo-bloat # check binaries size (which is fun but not terriby useful?)
cargo-cache # cargo cache -a
cargo-config
cargo-expand # for macro expension
cargo-spellcheck # Spellcheck documentation
# Podman
dockerCompat
podman # Docker compat
runc # Container runtime
conmon # Container runtime monitor
skopeo # Interact with container registry
slirp4netns # User-mode networking for unprivileged namespaces
fuse-overlayfs # CoW for images, much faster than default vfs
# Build Redox
ant
autoconf
automake
bison
cmake
curl
doxygen
expat
expect
file
flex
fuse
gmp
gnumake
gnupatch
gperf
just
libjpeg
libpng
libtool
llvmPackages.clang
llvmPackages.llvm
lua
m4
meson
nasm
perl
perl540Packages.HTMLParser
perl540Packages.Po4a
pkgconf
podman
protobuf
(python3.withPackages (ps: with ps; [mako]))
qemu_kvm
rust-cbindgen
scons
SDL
syslinux
texinfo
unzip
waf
wget
xdg-utils
zip
];
in {
devShells.default = with pkgs;
mkShell {
packages = buildInputs;
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
NIX_SHELL_BUILD = "1";
shellHook = ''
# Install required configuration
${podmanSetupScript}
echo "Redox environment loaded" | cowsay | lolcat
'';
};
});
}

7
mk/depends.mk
View file

@ -3,15 +3,10 @@
# Don't check for Rust/Cargo if you will be using Podman # Don't check for Rust/Cargo if you will be using Podman
ifneq ($(PODMAN_BUILD),1) ifneq ($(PODMAN_BUILD),1)
# don’t check for Rust and Cargo if building on a Nix system
ifneq ($(NIX_SHELL_BUILD),1)
ifeq ($(shell which rustup),) ifeq ($(shell which rustup),)
$(error rustup not found, install from "https://rustup.rs/") $(error rustup not found, install from "https://rustup.rs/")
endif endif
endif
ifeq ($(shell which cbindgen),) ifeq ($(shell which cbindgen),)
$(error cbindgen not found, install from crates.io or from your package manager) $(error cbindgen not found, install from crates.io or from your package manager)
endif endif
@ -24,11 +19,9 @@ ifeq ($(shell which just),)
$(error 'just' not found, install from crates.io or from your package manager) $(error 'just' not found, install from crates.io or from your package manager)
endif endif
ifneq ($(NIX_SHELL_BUILD),1)
CARGO_CONFIG_VERSION=0.1.1 CARGO_CONFIG_VERSION=0.1.1
ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config v$(CARGO_CONFIG_VERSION):$$'),) 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") $(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config")
endif endif
endif
endif endif

3
mk/fstools.mk
View file

@ -16,9 +16,6 @@ else
touch $@ touch $@
endif endif
$(INSTALLER): CC =
$(INSTALLER): TARGET = $(HOST_TARGET)
$(INSTALLER): RUSTUP_TOOLCHAIN =
$(INSTALLER): installer $(INSTALLER): installer
$(HOST_CARGO) build --bin redox_installer --manifest-path installer/Cargo.toml --release $(HOST_CARGO) build --bin redox_installer --manifest-path installer/Cargo.toml --release

11
mk/podman.mk
View file

@ -5,19 +5,10 @@
IMAGE_TAG?=redox-base IMAGE_TAG?=redox-base
## Working Directory in Podman ## Working Directory in Podman
CONTAINER_WORKDIR?=/mnt/redox CONTAINER_WORKDIR?=/mnt/redox
## Flag passed to the Podman volumes. :Z can be used only with SELinux
USE_SELINUX=1
ifeq ($(USE_SELINUX),1)
PODMAN_VOLUME_FLAG=:Z
else
PODMAN_VOLUME_FLAG=
endif
## Podman Home Directory ## Podman Home Directory
PODMAN_HOME?=$(ROOT)/build/podman PODMAN_HOME?=$(ROOT)/build/podman
## Podman command with its many arguments ## Podman command with its many arguments
PODMAN_VOLUMES?=--volume $(ROOT):$(CONTAINER_WORKDIR)$(PODMAN_VOLUME_FLAG) --volume $(PODMAN_HOME):/home$(PODMAN_VOLUME_FLAG) 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_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 BOARD=$(BOARD) --env CONFIG_NAME=$(CONFIG_NAME) --env FILESYSTEM_CONFIG=$(FILESYSTEM_CONFIG) PODMAN_CONFIG?=--env ARCH=$(ARCH) --env BOARD=$(BOARD) --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) PODMAN_OPTIONS?=--rm --workdir $(CONTAINER_WORKDIR) --userns keep-id --user `id -u` --interactive --tty --env TERM=$(TERM)

8
native_bootstrap.sh
View file

@ -150,7 +150,6 @@ osx_macports()
install_macports_pkg "p5-html-parser" install_macports_pkg "p5-html-parser"
install_macports_pkg "doxygen" install_macports_pkg "doxygen"
install_macports_pkg "gpatch" install_macports_pkg "gpatch"
install_macports_pkg "patchelf"
install_macports_pkg "automake" install_macports_pkg "automake"
install_macports_pkg "scons" install_macports_pkg "scons"
install_macports_pkg "gmake" install_macports_pkg "gmake"
@ -220,7 +219,6 @@ osx_homebrew()
install_brew_pkg "llvm" install_brew_pkg "llvm"
install_brew_pkg "doxygen" install_brew_pkg "doxygen"
install_brew_pkg "gpatch" install_brew_pkg "gpatch"
install_brew_pkg "patchelf"
install_brew_pkg "automake" install_brew_pkg "automake"
install_brew_pkg "scons" install_brew_pkg "scons"
install_brew_pkg "lua" install_brew_pkg "lua"
@ -292,7 +290,6 @@ freebsd()
install_freebsd_pkg "llvm" install_freebsd_pkg "llvm"
install_freebsd_pkg "doxygen" install_freebsd_pkg "doxygen"
install_freebsd_pkg "patch" install_freebsd_pkg "patch"
install_freebsd_pkg "patchelf"
install_freebsd_pkg "automake" install_freebsd_pkg "automake"
install_freebsd_pkg "scons" install_freebsd_pkg "scons"
install_freebsd_pkg "lua54" install_freebsd_pkg "lua54"
@ -331,7 +328,6 @@ archLinux()
curl \ curl \
file \ file \
patch \ patch \
patchelf \
automake \ automake \
scons \ scons \
waf \ waf \
@ -446,7 +442,6 @@ ubuntu()
nasm \ nasm \
ninja-build \ ninja-build \
patch \ patch \
patchelf \
perl \ perl \
pkg-config \ pkg-config \
po4a \ po4a \
@ -575,7 +570,6 @@ fedora()
gcc-c++ \ gcc-c++ \
openssl \ openssl \
patch \ patch \
patchelf \
automake \ automake \
perl-Pod-Html \ perl-Pod-Html \
perl-FindBin \ perl-FindBin \
@ -642,7 +636,6 @@ suse()
"perl-HTML-Parser" "perl-HTML-Parser"
"m4" "m4"
"patch" "patch"
"patchelf"
"scons" "scons"
"pkgconf" "pkgconf"
"syslinux-utils" "syslinux-utils"
@ -839,7 +832,6 @@ solus()
libtool-devel \ libtool-devel \
po4a \ po4a \
patch \ patch \
patchelf \
bison \ bison \
flex \ flex \
gperf \ gperf \

2
relibc

@ -1 +1 @@
Subproject commit 84f3d84ef94ca9d7df49c72e2b7d0d1a57620409 Subproject commit 365ec7fe7cce10aa51197a605e4801b8780cf758