From cf625ea48ac09b8b484f90e5971e2d8001aa76de Mon Sep 17 00:00:00 2001
From: Nathan Reiner <nathan@nathanreiner.xyz>
Date: Tue, 14 Feb 2023 08:21:54 +0100
Subject: change system structure

---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 40373a4..d90bcc9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.0.1
+ERSION=0.0.1
 SYSLINUX_VERSION=6.03
 KERNEL_VERSION=6.1.11
 TARGET=./target
@@ -34,13 +34,13 @@ target:
 
 initramfs: target core smash
 	@echo Installing Initramfs
-	@mkdir -p ${INITRAMFS}/bin ${INITRAMFS}/system/config ${INITRAMFS}/system/manual
-	@cp core/objects/* ${INITRAMFS}/bin/
+	@mkdir -p ${INITRAMFS}/system/config ${INITRAMFS}/system/manual ${INITRAMFS}/system/core ${INITRAMFS}/system/utils ${INITRAMFS}/system/scripts ${INITRAMFS}/system/devices
+	@cp core/objects/* ${INITRAMFS}/system/core/
+	@cp core/init ${INITRAMFS}/system/core/
+	@cp smash/smash ${INITRAMFS}/system/core/
+	@cp utils/* ${INITRAMFS}/system/utils/
 	@cp man/* ${INITRAMFS}/system/manual/
-	@cp smash/smash ${INITRAMFS}/bin/
-	@cp utils/* ${INITRAMFS}/bin/
-	@cp config/* ${INITRAMFS}/system/config
-	@mv ${INITRAMFS}/bin/init ${INITRAMFS}/init
+	@cp config/* ${INITRAMFS}/system/config/
 	@echo Building Initramfs
 	@cd ${INITRAMFS} && find . | cpio -o --quiet --format=newc > ../initramfs.img
 
@@ -52,7 +52,7 @@ ${TARGET}/kernel:
 	@mv linux-${KERNEL_VERSION} ${TARGET}/kernel-src
 	@cp build_config/linux.config ${TARGET}/kernel-src/.config
 	@echo Building Kernel
-	@$(MAKE) -C ${TARGET}/kernel-src > /dev/null
+	@$(MAKE) -C ${TARGET}/kernel-src
 	@cp ${TARGET}/kernel-src/arch/x86_64/boot/bzImage ${TARGET}/kernel
 
 ${TARGET}/syslinux:
@@ -84,9 +84,9 @@ iso: rootfs
 		-joliet \
 		-full-iso9660-filenames \
 		-input-charset UTF8 \
+		-no-emul-boot \
 		-b syslinux/isolinux.bin \
 		-c syslinux/boot.cat \
-		-no-emul-boot \
 		-boot-load-size 4 \
 		-boot-info-table \
 		-quiet \
-- 
cgit v1.2.3-70-g09d2