drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Fix image build process. #8

Merged
drew merged 1 commit from fix-build into main 2025-12-14 08:32:30 +00:00
Conversation 0 Commits 1 Files changed 4 +10 -9
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 311755c812 - Show all commits

3
rust-toolchain.toml Normal file
View file

@ -0,0 +1,3 @@
[toolchain]
channel = "nightly-2025-10-02"
components = ["rustfmt", "rust-analyzer"]

2
rust/rust-toolchain.toml
View file

@ -1,2 +0,0 @@
[toolchain]
channel = "nightly"

4
rust/x86_64-acadia-os.json
View file

@ -3,8 +3,8 @@
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
"arch": "x86_64",
"target-endian": "little",
"target-pointer-width": "64",
"target-c-int-width": "32",
"target-pointer-width": 64,
"target-c-int-width": 32,
"os": "none",
"executables": true,
"linker-flavor": "ld.lld",

10
scripts/build_image.sh
View file

@ -31,15 +31,15 @@ cleanup() {
}
trap cleanup EXIT
parted -s $dev mklabel gpt mkpart EFI fat32 1MiB 10MiB mkpart ext2 10MiB 100% set 1 esp on
mkfs.fat -F 12 "${dev}p1"
mke2fs "${dev}p2"
parted -s $dev mklabel gpt mkpart BIOS ext2 1MiB 2MiB mkpart EFI fat32 2MiB 11MiB mkpart ext2 11MiB 100% set 1 bios_grub on set 2 esp on
mkfs.fat -F 12 "${dev}p2"
mke2fs "${dev}p3"
limine bios-install "${dev}"
mkdir -p $EFI_DIR
mount "${dev}p1" $EFI_DIR
mount "${dev}p2" $EFI_DIR
mkdir -p $EFI_DIR/EFI/BOOT
cp /usr/share/limine/BOOTX64.EFI $EFI_DIR/EFI/BOOT
@ -52,7 +52,7 @@ cp $REPO_ROOT/sysroot/bin/denali $EFI_DIR/sys/denali
cp $REPO_ROOT/sysroot/bin/victoriafalls $EFI_DIR/sys/victoriafalls
mkdir -p $SYSROOT
mount "${dev}p2" $SYSROOT
mount "${dev}p3" $SYSROOT
rsync -a "$REPO_ROOT/sysroot" $BUILD_DIR
ls $SYSROOT