From 268ab18b4861a3f65c04af5187020b566cf1afac Mon Sep 17 00:00:00 2001
From: Adrien Bourmault <neox@os-k.eu>
Date: Fri, 22 Nov 2019 15:38:29 +0100
Subject: [PATCH] Some changes in Makefile to correct incompatibilities

---
 Makefile              | 18 +++++++-----------
 build/create_disk.sh  | 10 +++++-----
 build/install-os-k.sh | 12 ++++++------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index c090450..f75935b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
 #   along with OS/K.  If not, see <https://www.gnu.org/licenses/>.             #
 #=----------------------------------------------------------------------------=#
 
-.PHONY: all test test32 debug gdb install dust clean OS/K run
+.PHONY: all test test32 debug gdb installonimage dust clean OS/K run
 .DELETE_ON_ERROR: $(BINDIR)/kaleid
 .DEFAULT_GOAL := all
 
@@ -264,28 +264,24 @@ all :
 	@make OS/K -j 8
 ## QEMU/DEBUG RELATED
 
-testkvm: all install
+testkvm: all installonimage
 	@qemu-system-x86_64 -vga std -enable-kvm -soundhw pcspk -s \
 	 -rtc base=localtime -m $(ram) -hda $(installdisk) \
 	 -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
 run: test
 
-test: all install
+test: all installonimage
 	@qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \
 	 -rtc base=localtime -m $(ram) -hda $(installdisk) \
 	 -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
-	 	@qemu-system-x86_64 -vga std -soundhw pcspk -s \
-	 -rtc base=localtime -m 8192 -hda /dev/sdc \
-	 -d cpu_reset,guest_errors,pcall,int &
 
-
-test32: all install
+test32: all installonimage
 	@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \
 	 cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
 
-gdb: all install
+gdb: all installonimage
 	@setsid qemu-system-x86_64 -m $(ram) -soundhw pcspk -rtc base=localtime \
 	 -hda $(installdisk) -no-reboot -no-shutdown -d \
 	 cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@@ -295,7 +291,7 @@ gdb: all install
 	-ex "symbol-file $(BINDIR)/kaleid" \
 	-ex "break BtStartKern"            \
 
-ddd: all install_os_k
+ddd: all installonimage
 	@setsid qemu-system-x86_64 -m $(ram) -hda $(installdisk) -no-reboot -soundhw pcspk \
 	-no-shutdown -d cpu_reset,guest_errors,pcall,int -s 2> $(BUILDDIR)/qemu.log &
 	@ddd
@@ -303,7 +299,7 @@ ddd: all install_os_k
 
 ## HD IMAGE RELATED ---------------------------------------------------------- #
 
-install: $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
+installonimage: $(installdisk) $(MBRDIR)/grub.cfg
 	@echo ${CL2}[$@] ${NC}Installing MBR on image...${CL3}
 	@$(BUILDDIR)/install-os-k.sh $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
 	@echo ${CL2}[$@] ${CL}Success.${CL3}
diff --git a/build/create_disk.sh b/build/create_disk.sh
index 081d773..ec893e7 100755
--- a/build/create_disk.sh
+++ b/build/create_disk.sh
@@ -36,8 +36,8 @@ dd if=/dev/zero of=$1 bs=512 count=131072 status=progress
 
 ## Partition the image
 echo ${CL2}[create_disk.sh]${NC} Partitionning image... 	\(parted\)${CL3}
-#/sbin/parted --script $1 mktable msdos mkpart primary 2048s 100% set 1 boot on
-/sbin/fdisk $1 > /dev/null <<EEOF
+#sudo parted --script $1 mktable msdos mkpart primary 2048s 100% set 1 boot on
+sudo fdisk $1 > /dev/null <<EEOF
 n
 p
 1
@@ -49,7 +49,7 @@ EEOF
 
 ## Mount
 echo ${CL2}[create_disk.sh]${NC} Mount image... 		\(losetup\)${CL3}
-lpblock=$(/sbin/losetup -f)
+lpblock=$(sudo losetup -f)
 sudo losetup $lpblock $1 -o 1048576
 echo ${CL2}[create_disk.sh]${NC} Sync image... 		\(sync\)${CL3}
 sync
@@ -66,9 +66,9 @@ sudo losetup -d $lpblock
 
 ## Mount
 echo ${CL2}[create_disk.sh]${NC} Mount image... 		\(losetup\)${CL3}
-lpblock=$(/sbin/losetup -f)
+lpblock=$(sudo losetup -f)
 sudo losetup $lpblock $1 -o 1048576
-lpblockbase=$(/sbin/losetup -f)
+lpblockbase=$(sudo losetup -f)
 sudo losetup $lpblockbase $1
 sudo udisksctl mount -b $lpblock --no-user-interaction
 
diff --git a/build/install-os-k.sh b/build/install-os-k.sh
index 80c735e..3522eac 100755
--- a/build/install-os-k.sh
+++ b/build/install-os-k.sh
@@ -30,22 +30,22 @@ NC='\033[1;37m'
 
 set -e #exit if error
 
-echo ${CL2}[create_disk.sh]${NC} Mount image... 		\(udisksctl\)${CL3}
+echo ${CL2}[install-os-k.sh]${NC} Mount image... 		\(udisksctl\)${CL3}
 udisksctl loop-setup --offset 1048576 --no-user-interaction --file $1
 lpblock=$(/sbin/losetup -j $1 | cut -d ':' -f 1)
 
-echo ${CL2}[create_disk.sh]${NC} Sync image... 		\(sync\)${CL3}
+echo ${CL2}[install-os-k.sh]${NC} Sync image... 		\(sync\)${CL3}
 sync
 
 mountpoint=$(udisksctl info -b $lpblock | grep MountPoint | cut -d ':' -f 2 | sed 's/ //g')
 
-echo ${CL2}[grub-install.sh]${NC} Copying grub.cfg
+echo ${CL2}[install-os-k.sh]${NC} Copying grub.cfg
 cp $2 $mountpoint/boot/grub/grub.cfg
-echo ${CL2}[grub-install.sh]${NC} Copying kernel
+echo ${CL2}[install-os-k.sh]${NC} Copying kernel
 cp $3 $mountpoint/boot/kaleid
 
-echo ${CL2}[grub-install.sh]${NC} Sync image... 		\(sync\)${CL3}
+echo ${CL2}[install-os-k.sh]${NC} Sync image... 		\(sync\)${CL3}
 sync
 
-echo ${CL2}[create_disk.sh]${NC} Unmount image... 		\(udisksctl\)${CL3}
+echo ${CL2}[install-os-k.sh]${NC} Unmount image... 		\(udisksctl\)${CL3}
 udisksctl unmount --no-user-interaction -b $lpblock
\ No newline at end of file