Merge master into 0.2.0 (688 commits, theirs pref for conflicts)
This commit is contained in:
@@ -2,12 +2,6 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure cargo bin (cbindgen, rustup, etc.) is in PATH
|
||||
case ":${PATH}:" in
|
||||
*":$HOME/.cargo/bin:"*) ;;
|
||||
*) export PATH="$HOME/.cargo/bin:$PATH" ;;
|
||||
esac
|
||||
|
||||
CONFIG_NAME="redbear-mini"
|
||||
ARCH="x86_64"
|
||||
ALLOW_UPSTREAM=0
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Ensure cargo bin (cbindgen, rustup, etc.) is in PATH
|
||||
case ":${PATH}:" in
|
||||
*":$HOME/.cargo/bin:"*) ;;
|
||||
*) export PATH="$HOME/.cargo/bin:$PATH" ;;
|
||||
esac
|
||||
|
||||
qemu-system-x86_64 -m 8G -drive if=pflash,format=raw,readonly=on,file=/usr/share/edk2/x64/OVMF_CODE.4m.fd -drive file=/home/kellito/Builds/rbos/build/x86_64/redbear-full.iso,format=raw -device virtio-gpu-pci -enable-kvm -serial mon:stdio
|
||||
|
||||
Reference in New Issue
Block a user