MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'redoxer-arm' into 'master'

Browse Source 
Adapt redoxer daemon changes

See merge request redox-os/redox!1758
This commit is contained in:
Jeremy Soller 2025-12-11 10:54:54 -07:00
commit ca83e4dfa6
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/redoxer.toml
View File

@ -9,13 +9,9 @@ ca-certificates = {}
coreutils = {}
extrautils = {}
findutils = {}
gcc13 = {}
"gcc13.cxx" = {}
gnu-binutils = {}
ion = {}
netdb = {}
pkgutils = {}
redoxerd = {}
relibc = {}
# Override to not background dhcpd

1
config/x86_64/ci.toml
View File

@ -181,7 +181,6 @@ procedural-wallpapers-rs = {}
python312 = {}
#qemu = {} # can be built, but not working
readline = {}
redoxerd = {}
redox-fatfs = {}
redoxfs = {}
redox-games = {}

3
recipes/core/base/recipe.toml
View File

@ -38,6 +38,7 @@ BINS=(
virtio-netd
xhcid
inputd
redoxerd
)
# Add additional drivers to the list to build, that are not in drivers-initfs
@ -59,7 +60,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
$(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
for bin in "${BINS[@]}"
do
if [[ "${bin}" == "inputd" || "${bin}" == "pcid" || "${bin}" == "pcid-spawner" ]]; then
if [[ "${bin}" == "inputd" || "${bin}" == "pcid" || "${bin}" == "pcid-spawner" || "${bin}" == "redoxerd" ]]; then
cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/bin"
else
cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"