Added tarfs files and makefile flags

Author: LittleCodingFox

Makefile

@@ -22,7 +22,11 @@ LIBCBINDIR			= bin/libc
 LIBCOBJDIR			= obj/libc
 LIBKOBJDIR			= obj/libk
 
+MAKEBOOTDIR			= makebootdir.sh
+MAKEISOLINUX		= makeisolinux.sh
+
 OVMF				= /usr/share/qemu/OVMF.fd
+TARFS				= 0
 
 rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
 
@@ -104,6 +108,12 @@ ifeq ($(KASAN), 1)
 	CFLAGS += -DUSE_KASAN=1
 endif
 
+ifeq ($(TARFS), 1)
+	CFLAGS += -DUSE_TARFS=1
+	MAKEBOOTDIR = makebootdir_tar.sh
+	MAKEISOLINUX = makeisolinux_tar.sh
+endif
+
 makedirs:
 	mkdir -p bin
 	mkdir -p $(LIBCBINDIR)
@@ -194,8 +204,8 @@ libc: makedirs $(LIBCCOBJECTS) $(LIBCASMOBJECTS) $(EXTCOBJECTS)
 	cp -Rf toolchain/tools/host-gcc/x86_64-toast/lib64/* $(DISTDIR)/usr/lib64/
 
 iso-linux:
-	sh makebootdir.sh
-	sh makeisolinux.sh
+	sh $(MAKEBOOTDIR)
+	sh $(MAKEISOLINUX)
 
 userland: libc
 	@for path in $(shell find userland/* -maxdepth 0 -type d); do \

limine.cfg

@@ -18,8 +18,5 @@ MODULE_STRING=symbols.map
 MODULE_PATH=boot:///boot/font.psf
 MODULE_STRING=font.psf
 
-#MODULE_PATH=boot:///boot/initrd
-#MODULE_STRING=initrd
-
 # Remove the following line to enable kernel address layout randomisation.
 KASLR=no

limine_tar.cfg

@@ -0,0 +1,25 @@
+# Timeout in seconds that Limine will use before automatically booting.
+TIMEOUT=5
+ 
+# The entry name that will be displayed in the boot menu
+:Toast OS
+ 
+# Change the protocol line depending on the used protocol.
+PROTOCOL=stivale2
+
+RESOLUTION=1280x720x32
+ 
+# Path to the kernel to boot. boot:/// represents the partition on which limine.cfg is located.
+KERNEL_PATH=boot:///boot/kernel
+
+MODULE_PATH=boot:///boot/symbols.map
+MODULE_STRING=symbols.map
+
+MODULE_PATH=boot:///boot/font.psf
+MODULE_STRING=font.psf
+
+MODULE_PATH=boot:///boot/initrd
+MODULE_STRING=initrd
+
+# Remove the following line to enable kernel address layout randomisation.
+KASLR=no

makebootdir.sh

@@ -11,6 +11,3 @@ cp $BINDIR/$KERNEL_NAME boot/boot/
 mv symbols.map boot/boot/
 cp font.psf boot/boot/
 cp -Rf toolchain/system-root/* ./dist
-#cd dist
-#tar -cvf ../boot/boot/initrd *
-#cd ..

makebootdir_tar.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+BINDIR=bin
+KERNEL_NAME=kernel
+
+rm -Rf boot/
+
+mkdir -p boot/EFI/BOOT
+mkdir -p boot/boot
+
+cp $BINDIR/$KERNEL_NAME boot/boot/
+mv symbols.map boot/boot/
+cp font.psf boot/boot/
+cp -Rf toolchain/system-root/* ./dist
+cd dist
+tar -cvf ../boot/boot/initrd *
+cd ..

makeisolinux_tar.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+export BINDIR=bin
+export OS_NAME=ToastOS
+
+rm -Rf $BINDIR/*.img
+
+dd if=/dev/zero of=$BINDIR/$OS_NAME.img bs=1M count=1024
+
+(echo g
+echo n
+echo 1
+echo 2048
+echo +1000M
+echo t
+echo 1
+echo p
+echo w) | 
+fdisk -u -C500 -S63 -H16 $BINDIR/$OS_NAME.img
+
+git clone https://github.com/limine-bootloader/limine.git --branch=v2.0-branch-binary --depth=1
+
+make -C limine
+
+./limine/limine-install $BINDIR/$OS_NAME.img
+
+sudo mkdir -p /mnt/osdev
+
+export LOOP=`sudo losetup -f`
+
+#offset is 2048 * 512 (start of the partition)
+sudo losetup -o1048576 $LOOP $BINDIR/$OS_NAME.img
+
+sudo mkfs.vfat -F32 -n "EFI System" $LOOP
+
+sudo mount -tvfat $LOOP /mnt/osdev
+
+sudo cp limine_tar.cfg limine/limine.sys boot/
+
+sudo mv boot/limine_tar.cfg boot/limine.cfg
+
+sudo cp limine/BOOTX64.EFI boot/EFI/BOOT/
+
+sudo cp -R boot/* /mnt/osdev
+
+sync
+
+rm -Rf limine
+
+sudo umount $LOOP
+
+sudo losetup -d $LOOP
+
+echo Done!

src/include/kernel.h

@@ -4,7 +4,10 @@
 #define KPREFIX(n) k_##n
 
 #define USE_INPUT_SYSTEM    1
-#define USE_TARFS           0
+
+#ifndef USE_TARFS
+#   define USE_TARFS           0
+#endif
 
 #include "defines.h"
 

src/low-level/partitionmanager/PartitionManager.cpp

@@ -55,10 +55,12 @@ void PartitionManager::Initialize()
 
             DEBUG_OUT("[PartitionManager] \t%s with size: %s, type: %s)", partition.GetID().ToString(), partition.SizeString(), partition.GetType().ToString());
 
+#if !USE_TARFS
             if(Ext2FileSystem::IsValid(&partition))
             {
                 disk.fileSystem = new Ext2FileSystem(&partition);
             }
+#endif
 
             if(disk.fileSystem != NULL)
             {