Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop support for config-parser

Browse Source
This commit is contained in:
Kevin Lange 2014-03-23 19:32:52 -07:00
parent 430d9c0ce2
commit 13c619e9c3
2 changed files with 1 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -81,7 +81,7 @@ DISK_ROOT = root=/dev/hda
.PHONY: all system install test
.PHONY: clean clean-soft clean-hard clean-bin clean-mods clean-core clean-disk clean-once
.PHONY: run vga term headless run-config
.PHONY: run vga term headless
.PHONY: kvm vga-kvm term-kvm
# Prevents Make from removing intermediary files on failure
@ -113,8 +113,6 @@ term-kvm: system
${EMU} ${EMUARGS} ${EMUKVM} -append "vid=qemu start=--single $(DISK_ROOT)"
headless: system
${EMU} ${EMUARGS} -display none -append "start=--vga $(DISK_ROOT)"
run-config: system
util/config-parser ${EMU}
test: system
python2 util/run-tests.py 2>/dev/null

58
util/config-parser
View File

@ -1,58 +0,0 @@
#!/bin/bash
# Set some defaults
RESOLUTION="1024x768"
ENABLE_KVM=true
EMU_MEMORY=1024
FULLSCREEN=false
ENABLE_SERIAL=true
ENABLE_GRAPHICS=true
BORDERLESS=true
SINGLE=false
DEBUG_SERIAL=false
# Load the config file
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ -e "$DIR/../.config" ]; then
. "$DIR/../.config"
fi
# Parse some things
ENABLEKVM=""
if [ $ENABLE_KVM == true ]; then
ENABLEKVM="-enable-kvm"
fi
FULL_SCREEN=""
if [ $FULLSCREEN == true ]; then
FULL_SCREEN="-full-screen"
fi
SERIAL=""
if [ $ENABLE_SERIAL ]; then
SERIAL="-serial stdio"
fi
# This is actually a qemu "quirk" of sorts, double comma inserts an actual comma,
# but a single comma separates MODULE arguments, so watch out!
RESPARSED=`echo $RESOLUTION | sed 's/x/,,/'`
GRAPHICS="vid=qemu,,$RESPARSED"
if [ $ENABLE_GRAPHICS == false ]; then
GRAPHICS="vgaterm"
fi
BORDERS="-no-frame"
if [ $BORDERLESS == false ]; then
BORDERS=""
fi
if [ $SINGLE == true ]; then
GRAPHICS="$GRAPHICS single"
fi
if [ $DEBUG_SERIAL == true ]; then
GRAPHICS="$GRAPHICS logtoserial=0"
fi
# Generate the QEMU arguments list
$1 -kernel toaruos-kernel -m $EMU_MEMORY $ENABLEKVM $FULL_SCREEN $SERIAL -vga std -rtc base=localtime -hda toaruos-disk.img -k en-us $BORDERS -append "$GRAPHICS hdd" -sdl