diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f770c73ca397a16038a765a35caaacd85f8ca14..62075a45844a4fbd6e5f07004218b4e204261ea9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,8 @@ -image: ubuntu +image: archlinux/base before_script: - - apt update - - apt install -y nasm g++ make + - pacman -Sy + - pacman -S --noconfirm nasm gcc make build32: script: diff --git a/kernel/Makefile b/kernel/Makefile index 91ca42462d6043efe5769cfce8ee8fc81fa35755..a54af1161a487c5e22d67769ac1b159b8aa24d10 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -10,10 +10,6 @@ endif assemble: kernel head ld -o kernel.img -Ttext 0x7e00 --oformat binary image_head.o kernel.o -m elf_$(ARCH) - # Sector 1 = bootloader, Sector 2 - (512B TO 64K) = kernel - # Extend kernel.img to correct size. - test $$(stat -c %s kernel.img) -le 65024 - truncate --size=65024 kernel.img head: nasm -f elf$(BITS) -DTARGET_BITS=$(BITS) image_head.asm -o image_head.o