diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index fd3fdc35f..0766fad37 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -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"