From f5dae4984d76cb467e95c6bd73186f1c55844696 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Tue, 11 Nov 2025 01:49:49 +0100 Subject: [PATCH] Rename base.img.6pack to base.img.6pk --- .gitignore | 2 +- kernel/baseimg/baseimg.c | 8 ++++---- limine.conf | 2 +- scripts/mkbaseimg.sh | 4 ++-- scripts/mkiso.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b85cfac..49ca752 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ *.iso *.img *.hdd -*.6pack +*.6pk diff --git a/kernel/baseimg/baseimg.c b/kernel/baseimg/baseimg.c index a55be0b..1058dc6 100644 --- a/kernel/baseimg/baseimg.c +++ b/kernel/baseimg/baseimg.c @@ -29,17 +29,17 @@ void baseimg_init(void) { LOG("baseimg", "looking for base image...\n"); for (size_t i = 0; i < BOOT_INFO.modules->module_count; i++) { struct limine_file *module = BOOT_INFO.modules->modules[i]; - if (hal_strcmp(util_get_filename(module->path), "base.img.6pack") == 0) { + if (hal_strcmp(util_get_filename(module->path), "base.img.6pk") == 0) { baseimg = module; break; } } if (baseimg == NULL) { - ERR("baseimg", "base.img.6pack not found\n"); + ERR("baseimg", "base.img.6pk not found\n"); hal_hang(); } else { - LOG("baseimg", "base.img.6pack found\n"); + LOG("baseimg", "base.img.6pk found\n"); LOG("baseimg", "addr = %p, size = %lu\n", baseimg->address, baseimg->size); for (size_t i = 0; i < 30; i++) { kprintf("%02X ", ((uint8_t *)(baseimg->address))[i]); @@ -53,7 +53,7 @@ void baseimg_init(void) { int res = sixpack_decompress_mem(baseimg->address, baseimg->size, BASEIMG_DECOMP_ADDR, BASEIMG_DECOMPRESSED); if (res < 0) { - ERR("baseimg", "could not uncompress base.img.6pack\n"); + ERR("baseimg", "could not uncompress base.img.6pk\n"); hal_hang(); } BASEIMG_DECOMP_SIZE = res; diff --git a/limine.conf b/limine.conf index cfaa3ea..83fc733 100644 --- a/limine.conf +++ b/limine.conf @@ -4,4 +4,4 @@ verbose: yes /mop2 protocol: limine path: boot():/boot/mop2 - module_path: boot():/base.img.6pack + module_path: boot():/base.img.6pk diff --git a/scripts/mkbaseimg.sh b/scripts/mkbaseimg.sh index de3b4df..9ad576e 100755 --- a/scripts/mkbaseimg.sh +++ b/scripts/mkbaseimg.sh @@ -1,6 +1,6 @@ #!/bin/sh -rm -f base.img base.img.6pack +rm -f base.img base.img.6pk cat user/FILES.txt | while read line; do cp -v $line base/bin; done mklittlefs -c base -b 512 -s $((1<<20)) base.img -./FastLZ/examples/6pack -2 base.img base.img.6pack +./FastLZ/examples/6pack -2 base.img base.img.6pk diff --git a/scripts/mkiso.sh b/scripts/mkiso.sh index 491a44c..33224fb 100755 --- a/scripts/mkiso.sh +++ b/scripts/mkiso.sh @@ -3,7 +3,7 @@ rm -rf iso_root mkdir -p iso_root/boot cp -v kernel/mop2 iso_root/boot -cp -v base.img.6pack iso_root +cp -v base.img.6pk iso_root mkdir -p iso_root/boot/limine cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \ limine/limine-uefi-cd.bin iso_root/boot/limine