Удалена сборка RAW образа

This commit is contained in:
Aren Elchinyan 2024-09-16 18:29:16 +03:00
parent 89652e9819
commit 6d414307dc
3 changed files with 3 additions and 20 deletions

View File

@ -64,7 +64,6 @@ jobs:
draft: true
files: |
${{ github.workspace }}/rel/kernel.elf
${{ github.workspace }}/rel/bmosp.hdd
${{ github.workspace }}/rel/bmosp.iso
${{ github.workspace }}/rel/LICENSE

4
run.sh
View File

@ -1,10 +1,10 @@
#!/bin/sh
qemu-system-x86_64 -name "БМПОС" -cpu max -m 64M -smp 1 \
-serial file:serial.log \
-drive file=bmosp.hdd,if=none,id=sata_drive -device ahci \
-drive file=bmosp.iso,if=none,id=sata_drive -device ahci \
-device virtio-blk-pci,drive=sata_drive \
-rtc base=localtime,clock=host \
--no-reboot -no-shutdown \
--no-reboot -no-shutdown -boot d \
-net nic,model=pcnet # AMD PCnet Am79C970
#qemu-system-x86_64 -name "БМПОС" -cpu max -m 1G -smp 1 -hda bmosp.hdd --no-reboot
#qemu-system-x86_64 -name "БМПОС" -cpu max -m 1G -smp 1 -cdrom bmosp.iso -boot d --no-reboot

View File

@ -91,7 +91,7 @@ def compile_all():
def check_limine():
if not os.path.isdir("limine"):
subprocess.run(["git", "clone", "https://git.synapseos.ru/Aren/limine.git", "--branch=v5.x-branch-binary", "--depth=1"])
subprocess.run(["git", "clone", "https://git.synapseos.ru/mirrors/limine.git", "--branch=v5.x-branch-binary", "--depth=1"])
else:
os.chdir("limine")
subprocess.run(["git", "pull"])
@ -100,19 +100,6 @@ def check_limine():
subprocess.run(["make"])
os.chdir("..")
def create_hdd(IMAGE_NAME):
os.system(f"rm -f {IMAGE_NAME}.hdd".format())
os.system(f"dd if=/dev/zero bs=1M count=0 seek=4 of={IMAGE_NAME}.hdd")
os.system(f"sgdisk {IMAGE_NAME}.hdd -n 1:2048 -t 1:ef00")
os.system(f"./limine/limine bios-install {IMAGE_NAME}.hdd")
os.system(f"mformat -i {IMAGE_NAME}.hdd@@1M")
os.system(f"mmd -i {IMAGE_NAME}.hdd@@1M ::/EFI ::/EFI/BOOT")
os.system(f"mcopy -i {IMAGE_NAME}.hdd@@1M kernel.elf configs/limine.cfg limine/limine-bios.sys ::/")
os.system(f"mcopy -i {IMAGE_NAME}.hdd@@1M iso_root/mod/ ::/")
os.system(f"mcopy -i {IMAGE_NAME}.hdd@@1M limine/BOOTX64.EFI limine/BOOTIA32.EFI ::/EFI/BOOT")
os.system(f"./limine/limine bios-install {IMAGE_NAME}.hdd")
def create_iso(IMAGE_NAME):
os.system(f"rm -f {IMAGE_NAME}.iso")
os.system(f"rm -rf iso_root")
@ -165,7 +152,4 @@ if __name__ == "__main__":
print("Создание ISO образа")
create_iso("bmosp")
print("Создание HDD образа")
create_hdd("bmosp")
print(f"Не забудьте сохранить изменения! Номер сборки: {major}.{minor}.{build}")