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

Merge branch 'move_kernel_to_usr' into 'master'

Browse Source 
Move kernel and initfs to /usr/lib/boot

See merge request redox-os/redox!1984
This commit is contained in:
Jeremy Soller 2026-03-07 08:26:24 -07:00
commit 2e2e6695ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/core/base-initfs/recipe.toml
View File

@ -116,6 +116,6 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \
env -u CARGO -u RUSTFLAGS cargo run --manifest-path "${COOKBOOK_SOURCE}/initfs/tools/Cargo.toml" --bin redox-initfs-ar -- "${COOKBOOK_BUILD}/initfs" "${COOKBOOK_BUILD}/bootstrap" -o "${COOKBOOK_BUILD}/initfs.img"
mkdir -v "${COOKBOOK_STAGE}/boot"
cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/boot/initfs"
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
cp "${COOKBOOK_BUILD}/initfs.img" "${COOKBOOK_STAGE}/usr/lib/boot/initfs"
"""

4
recipes/core/kernel/recipe.toml
View File

@ -5,6 +5,6 @@ git = "https://gitlab.redox-os.org/redox-os/kernel.git"
template = "custom"
script = """
make -f ${COOKBOOK_SOURCE}/Makefile
mkdir -v "${COOKBOOK_STAGE}/boot"
cp -v kernel "${COOKBOOK_STAGE}/boot"
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
cp -v kernel "${COOKBOOK_STAGE}/usr/lib/boot"
"""