Skip to content

Commit

Permalink
Modernify some build toolset
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexTMjugador committed Jun 30, 2024
1 parent a6aa323 commit 7b4698b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
16 changes: 4 additions & 12 deletions .github/workflows/make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Install NASM
uses: mstksg/get-package@v1
with:
apt-get: nasm
- name: Install BBE
uses: mstksg/get-package@v1
with:
apt-get: bbe
- name: Install NASM and BBE
run: sudo apt-get update && sudo apt-get install nasm bbe
- name: Checkout code
uses: actions/checkout@v2
- name: 'CI patch: relax payload size constraints'
run: sed -Ei 's/, LENGTH = [0-9]*k/, LENGTH = 32k/' linker.ld
uses: actions/checkout@v4
- name: make
run: make
- name: Upload raw disk image
uses: actions/upload-artifact@v1.0.0
uses: actions/upload-artifact@v4
with:
name: disk.img
path: build/disk.img
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ $(BUILD_DIR)/payload.bin: linker.ld $(PAYLOAD_FILES) $(ASSETS_HEADER) $(BUILD_DI
@echo 'CC $(PAYLOAD_CODE_FILES)'
@$(CC) -s -std=c11 -march=i386 -mtune=generic -m32 -masm=intel -fno-pie -mgeneral-regs-only \
-Os -ffreestanding -nostdlib -Wl,--build-id=none,--hash-style=sysv,--gc-sections,--print-map \
-ffunction-sections -fdata-sections -Tlinker.ld -Wall -Wextra \
-ffunction-sections -fdata-sections -Tlinker.ld -Wall -Wextra --param=min-pagesize=0 \
-o '$@' $(PAYLOAD_CODE_FILES)

$(BUILD_DIR)/disk.img: $(BUILD_DIR)/bootloader.bin $(BUILD_DIR)/payload.bin $(BUILD_DIR)
Expand Down

0 comments on commit 7b4698b

Please sign in to comment.