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

Merge branch 'move_drivers' into 'master'

Browse Source 
Move drivers to /usr/lib/drivers

See merge request redox-os/cookbook!371
This commit is contained in:
Jeremy Soller 2024-06-22 16:03:52 +00:00
commit d7f1f5be2a
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
recipes/core/drivers-initfs/recipe.toml
View File

@ -52,7 +52,7 @@ case "${TARGET}" in
;;
esac
mkdir -pv "${COOKBOOK_STAGE}/bin"
mkdir -pv "${COOKBOOK_STAGE}/bin" "${COOKBOOK_STAGE}/lib/drivers"
export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
export CARGO_PROFILE_RELEASE_PANIC=abort
"${COOKBOOK_CARGO}" build --release \
@ -60,7 +60,14 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
$(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
for bin in "${BINS[@]}"
do
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
case "${bin}" in
pcid | fbcond | inputd | vesad | lived | ps2d | acpid)
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
;;
*)
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/lib/drivers"
;;
esac
done
mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"

15
recipes/core/drivers/recipe.toml
View File

@ -33,7 +33,7 @@ case "${TARGET}" in
esac
#Build each driver in the list
mkdir -pv "${COOKBOOK_STAGE}/bin"
mkdir -pv "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/lib/drivers"
export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
export CARGO_PROFILE_RELEASE_PANIC=abort
"${COOKBOOK_CARGO}" build --release \
@ -41,16 +41,13 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
$(for bin in "${BINS[@]}"; do echo "-p" "${bin}"; done)
for bin in "${BINS[@]}"
do
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
if [[ "${bin}" == "pcid" ]]; then
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/bin"
else
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"
fi
done
mkdir -pv "${COOKBOOK_STAGE}/bin"
${FIND} "target/${TARGET}/release" \
-maxdepth 1 \
-executable \
-type f \
-exec cp -v {} "${COOKBOOK_STAGE}/bin/" ';'
mkdir -pv "${COOKBOOK_STAGE}/etc/pcid"
cp -v "${COOKBOOK_SOURCE}/initfs.toml" "${COOKBOOK_STAGE}/etc/pcid/initfs.toml"