Edited Dockerfile

heliobatimarqui · Jul 20, 2024 · f2f5cee · f2f5cee
1 parent 4f929e0
commit f2f5cee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/actions/riscv64build/Dockerfile b/.github/actions/riscv64build/Dockerfile
@@ -1,7 +1,7 @@
 FROM --platform=linux/x86_64 debian:12
 
 RUN apt update
-RUN apt -y install gcc-12 g++-12 git make g++-12-riscv64-linux-gnu gcc-riscv64-unknown-elf
+RUN apt -y install make gcc-12 g++-12 g++-12-riscv64-linux-gnu gcc-riscv64-unknown-elf gcc-riscv64-linux-gnu g++-riscv64-linux-gnu
 
 ENV CPLUS_INCLUDE_PATH=/usr/riscv64-linux-gnu/include/c++/12/riscv64-linux-gnu/:/usr/riscv64-linux-gnu/include:/usr/include/c++/12:/usr/include 
 ENV C_INCLUDE_PATH=/usr/include

diff --git a/script.sh b/script.sh
@@ -23,7 +23,7 @@ else
     exit
 fi
 
-qemu-system-riscv64 -s -S -serial stdio -monitor unix:qemu-monitor-socket,server,nowait -parallel none -machine virt -cpu rv64 -smp 1 -m 1G -machine virt -device ich9-ahci,id=ahci -drive if=none,file=hdd.dmg,format=raw,id=mydisk -device ide-hd,drive=mydisk,bus=ahci.0 -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0 -bios u-boot-dtb.bin -device loader,file=u-boot.itb,addr=0x80200000 
+qemu-system-riscv64 -serial stdio -monitor unix:qemu-monitor-socket,server,nowait -parallel none -machine virt -cpu rv64 -smp 1 -m 1G -machine virt -device ich9-ahci,id=ahci -drive if=none,file=hdd.dmg,format=raw,id=mydisk -device ide-hd,drive=mydisk,bus=ahci.0 -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0 -bios u-boot-dtb.bin -device loader,file=u-boot.itb,addr=0x80200000 
 
 rm $hdd_image_name.dmg
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ else @@
         exit
     fi
-    qemu-system-riscv64 -s -S -serial stdio -monitor unix:qemu-monitor-socket,server,nowait -parallel none -machine virt -cpu rv64 -smp 1 -m 1G -machine virt -device ich9-ahci,id=ahci -drive if=none,file=hdd.dmg,format=raw,id=mydisk -device ide-hd,drive=mydisk,bus=ahci.0 -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0 -bios u-boot-dtb.bin -device loader,file=u-boot.itb,addr=0x80200000
+    qemu-system-riscv64 -serial stdio -monitor unix:qemu-monitor-socket,server,nowait -parallel none -machine virt -cpu rv64 -smp 1 -m 1G -machine virt -device ich9-ahci,id=ahci -drive if=none,file=hdd.dmg,format=raw,id=mydisk -device ide-hd,drive=mydisk,bus=ahci.0 -device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0 -bios u-boot-dtb.bin -device loader,file=u-boot.itb,addr=0x80200000
     rm $hdd_image_name.dmg
@@ Expand Down @@