kamkow1/my-os-project2
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename base.img.6pack to base.img.6pk

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-11-11 01:49:49 +01:00
parent 8fc99a5fb1
commit f5dae4984d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,4 +3,4 @@
*.iso *.iso
*.img *.img
*.hdd *.hdd
*.6pack *.6pk

8
kernel/baseimg/baseimg.c
View File

@ -29,17 +29,17 @@ void baseimg_init(void) {
LOG("baseimg", "looking for base image...\n"); LOG("baseimg", "looking for base image...\n");
for (size_t i = 0; i < BOOT_INFO.modules->module_count; i++) { for (size_t i = 0; i < BOOT_INFO.modules->module_count; i++) {
struct limine_file *module = BOOT_INFO.modules->modules[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; baseimg = module;
break; break;
} }
} }
if (baseimg == NULL) { if (baseimg == NULL) {
ERR("baseimg", "base.img.6pack not found\n"); ERR("baseimg", "base.img.6pk not found\n");
hal_hang(); hal_hang();
} else { } 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); LOG("baseimg", "addr = %p, size = %lu\n", baseimg->address, baseimg->size);
for (size_t i = 0; i < 30; i++) { for (size_t i = 0; i < 30; i++) {
kprintf("%02X ", ((uint8_t *)(baseimg->address))[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, int res = sixpack_decompress_mem(baseimg->address, baseimg->size,
BASEIMG_DECOMP_ADDR, BASEIMG_DECOMPRESSED); BASEIMG_DECOMP_ADDR, BASEIMG_DECOMPRESSED);
if (res < 0) { if (res < 0) {
ERR("baseimg", "could not uncompress base.img.6pack\n"); ERR("baseimg", "could not uncompress base.img.6pk\n");
hal_hang(); hal_hang();
} }
BASEIMG_DECOMP_SIZE = res; BASEIMG_DECOMP_SIZE = res;

2
limine.conf
View File

@ -4,4 +4,4 @@ verbose: yes
/mop2 /mop2
protocol: limine protocol: limine
path: boot():/boot/mop2 path: boot():/boot/mop2
module_path: boot():/base.img.6pack module_path: boot():/base.img.6pk

4
scripts/mkbaseimg.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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 cat user/FILES.txt | while read line; do cp -v $line base/bin; done
mklittlefs -c base -b 512 -s $((1<<20)) base.img 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

2
scripts/mkiso.sh
View File

@ -3,7 +3,7 @@
rm -rf iso_root rm -rf iso_root
mkdir -p iso_root/boot mkdir -p iso_root/boot
cp -v kernel/mop2 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 mkdir -p iso_root/boot/limine
cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \ cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \
limine/limine-uefi-cd.bin iso_root/boot/limine limine/limine-uefi-cd.bin iso_root/boot/limine