From e2a676fd854ac530635e19bcf72d2173fb62cb85 Mon Sep 17 00:00:00 2001 From: greg Date: Fri, 5 Jun 2015 00:29:06 -0700 Subject: [PATCH] Changes to build infrastructure Necessary to get a working build on my machine --- .bochsrc | 4 ---- GNUmakefile | 6 ++---- tools/copy_to_image.sh | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.bochsrc b/.bochsrc index 074e5d5..2995c75 100644 --- a/.bochsrc +++ b/.bochsrc @@ -490,7 +490,6 @@ parport1: enabled=1, file="/dev/stdout" # Examples: # vga_update_interval: 250000 #======================================================================= -vga_update_interval: 300000 # using for Winstone '98 tests #vga_update_interval: 100000 @@ -502,7 +501,6 @@ vga_update_interval: 300000 # Examples: # keyboard_serial_delay: 200 #======================================================================= -keyboard_serial_delay: 250 #======================================================================= # KEYBOARD_PASTE_DELAY: @@ -519,7 +517,6 @@ keyboard_serial_delay: 250 # Examples: # keyboard_paste_delay: 100000 #======================================================================= -keyboard_paste_delay: 100000 #======================================================================= # MOUSE: @@ -628,7 +625,6 @@ private_colormap: enabled=0 # Examples: # keyboard_mapping: enabled=1, map=gui/keymaps/x11-pc-de.map #======================================================================= -keyboard_mapping: enabled=0, map= #======================================================================= # KEYBOARD_TYPE: diff --git a/GNUmakefile b/GNUmakefile index e6e0d43..2ff6e05 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -57,9 +57,6 @@ all: KERN_CFLAGS := $(CFLAGS) -DARCANOS_KERNEL -gstabs USER_CFLAGS := $(CFLAGS) -I usr/inc -DARCANOS_USER -gstabs - - - # Include Makefrags for subdirectories include kern/Makefrag include usr/lib/Makefrag @@ -73,10 +70,11 @@ clean: # Auto-copy to boot disk image load: all + mkdir -p mnt ./tools/copy_to_image.sh always: @: .PHONY: all always \ - clean + clean diff --git a/tools/copy_to_image.sh b/tools/copy_to_image.sh index 2765e6e..2003760 100755 --- a/tools/copy_to_image.sh +++ b/tools/copy_to_image.sh @@ -7,8 +7,8 @@ else sudo losetup /dev/loop2 -o 1048576 /dev/loop1 sudo mount /dev/loop2 mnt fi - cp -v obj/kern/kernel mnt/kernel + sudo cp -v obj/kern/kernel mnt/kernel sync - sudo umount /dev/loop2 + sudo umount /dev/loop2 sudo losetup -d /dev/loop2 sudo losetup -d /dev/loop1 -- 2.34.1