boot: update bootloader recipe (live feature), remove initfs redox-drm service
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
+1
-1
Submodule local/sources/base updated: 0443de2474...1b9b8be0fc
@@ -1,8 +0,0 @@
|
||||
[unit]
|
||||
description = "DRM/KMS Display Driver"
|
||||
requires_weak = ["20_graphics.target", "40_hwd.service", "40_pcid-spawner-initfs.service"]
|
||||
condition_architecture = ["x86", "x86_64"]
|
||||
|
||||
[service]
|
||||
cmd = "redox-drm"
|
||||
type = "notify"
|
||||
@@ -10,10 +10,13 @@ mkdir -pv "${COOKBOOK_STAGE}/usr/lib/boot"
|
||||
function bootloader {
|
||||
src="$2"
|
||||
dst="$3"
|
||||
features="${4:-}"
|
||||
RUSTFLAGS="--cfg aes_force_soft" rustup run nightly cargo rustc \
|
||||
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
|
||||
-Z build-std=core,alloc -Z build-std-features=compiler-builtins-mem \
|
||||
--target "$1" --bin bootloader --release -- \
|
||||
--target "$1" --bin bootloader --release \
|
||||
${features:+--features} ${features:+"$features"} \
|
||||
-- \
|
||||
--emit link="${OUTDIR}/${src}"
|
||||
cp -v "${OUTDIR}/${src}" "${COOKBOOK_STAGE}/usr/lib/boot/${dst}"
|
||||
}
|
||||
@@ -21,10 +24,13 @@ function bootloader {
|
||||
function bootloader_bios {
|
||||
src="$2"
|
||||
dst="$3"
|
||||
features="${4:-}"
|
||||
RUST_TARGET_PATH="${COOKBOOK_SOURCE}/targets" RUSTFLAGS="--cfg aes_force_soft" rustup run nightly cargo -Zunstable-options rustc \
|
||||
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
|
||||
-Z build-std=core,alloc -Z build-std-features=compiler-builtins-mem \
|
||||
--target "$1" --bin bootloader --release -- \
|
||||
--target "$1" --bin bootloader --release \
|
||||
${features:+--features} ${features:+"$features"} \
|
||||
-- \
|
||||
--emit link="${OUTDIR}/${src}"
|
||||
cp -v "${OUTDIR}/${src}" "${COOKBOOK_STAGE}/usr/lib/boot/${dst}"
|
||||
}
|
||||
@@ -35,13 +41,13 @@ ARCH="$(echo "${TARGET}" | cut -d - -f1)"
|
||||
if false && [ "${ARCH}" == "i586" -o "${ARCH}" == "i686" -o "${ARCH}" == "x86_64" ]
|
||||
then
|
||||
bootloader_bios "x86-unknown-none" bootloader.bin bootloader.bios
|
||||
bootloader_bios "x86-unknown-none" bootloader-live.bin bootloader-live.bios
|
||||
bootloader_bios "x86-unknown-none" bootloader-live.bin bootloader-live.bios live
|
||||
fi
|
||||
|
||||
# Build UEFI bootloader for supported architectures
|
||||
if [ "${ARCH}" == "aarch64" -o "${ARCH}" == "x86_64" -o "${ARCH}" == "riscv64gc" ]
|
||||
then
|
||||
bootloader "${ARCH}-unknown-uefi" bootloader.efi bootloader.efi
|
||||
bootloader "${ARCH}-unknown-uefi" bootloader-live.efi bootloader-live.efi
|
||||
bootloader "${ARCH}-unknown-uefi" bootloader-live.efi bootloader-live.efi live
|
||||
fi
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user