diff --git a/local/sources/base b/local/sources/base index 0443de2474..1b9b8be0fc 160000 --- a/local/sources/base +++ b/local/sources/base @@ -1 +1 @@ -Subproject commit 0443de2474e20ed9ec0367329ebae54cdf49e85f +Subproject commit 1b9b8be0fc6c23554cc29b569629ab8e955d7168 diff --git a/recipes/core/base/init.initfs.d/30_redox-drm.service b/recipes/core/base/init.initfs.d/30_redox-drm.service deleted file mode 100644 index ba380bf2ec..0000000000 --- a/recipes/core/base/init.initfs.d/30_redox-drm.service +++ /dev/null @@ -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" diff --git a/recipes/core/bootloader/recipe.toml b/recipes/core/bootloader/recipe.toml index 8a6aba3a6e..8a29be6111 100644 --- a/recipes/core/bootloader/recipe.toml +++ b/recipes/core/bootloader/recipe.toml @@ -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 """