From 31d8029a44348c38aeb7f9f92daf5bb13f11cf25 Mon Sep 17 00:00:00 2001
From: Bensong Liu <bensl@microsoft.com>
Date: Tue, 8 Dec 2020 17:10:00 +0800
Subject: [PATCH] change ubuntu to archlinux to fix CI problem
---
.gitlab-ci.yml | 6 +++---
kernel/Makefile | 4 ----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f770c7..62075a4 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 91ca424..a54af11 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
--
GitLab