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

Merge branch 'initfs_fixed_init_config' into 'master'

Browse Source 
Remove support for target specific driver configs

See merge request redox-os/redox!1955
This commit is contained in:
Jeremy Soller 2026-02-28 09:12:24 -07:00
commit 705919e2da
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,6 @@ rm -rf "${COOKBOOK_BUILD}/initfs"
mkdir -p "${COOKBOOK_BUILD}/initfs/lib/init.d"
cp "${COOKBOOK_SOURCE}/init.d"/* "${COOKBOOK_BUILD}/initfs/lib/init.d/"
if [ -e ${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers.${BOARD} ]; then
cp "${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers.${BOARD}" "${COOKBOOK_BUILD}/initfs/lib/init.d/40_drivers"
elif [ -e ${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers ]; then
cp "${COOKBOOK_SOURCE}/init.d.${TARGET}/40_drivers" "${COOKBOOK_BUILD}/initfs/lib/init.d/40_drivers"
fi
mkdir -pv "${COOKBOOK_BUILD}/initfs/lib/pcid.d"
cp -v "${COOKBOOK_SOURCE}/drivers/initfs.toml" "${COOKBOOK_BUILD}/initfs/lib/pcid.d/initfs.toml"
@ -119,7 +114,7 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \
-z max-page-size=4096 \
"${COOKBOOK_BUILD}/${TARGET}/release/libbootstrap.a"
env -u CARGO 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"
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"