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

I give up; just use qemu-system-i386 everywhere.

Browse Source
This commit is contained in:
Kevin Lange 2012-09-03 23:40:50 -07:00
parent 7bcc2e1264
commit 89034c060f
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.build-travis.sh
View File

@ -3,9 +3,6 @@
unset CC unset CC
sudo apt-get install clang yasm genext2fs build-essential wget libmpfr-dev libmpc-dev libgmp-dev qemu autoconf automake texinfo sudo apt-get install clang yasm genext2fs build-essential wget libmpfr-dev libmpc-dev libgmp-dev qemu autoconf automake texinfo
sudo apt-get remove kvm-ipxe sudo apt-get remove kvm-ipxe
mkdir ~/bin
ln -s `which qemu-system-i386` ~/bin/qemu
export PATH="~/bin:$PATH"
# Build the toolchain: (silently) # Build the toolchain: (silently)
pushd toolchain pushd toolchain

2
Makefile
View File

@ -24,7 +24,7 @@ REALEMU = $(patsubst %.c,%.o,$(wildcard kernel/v8086/*.c))
SUBMODULES = ${MODULES} ${FILESYSTEMS} ${VIDEODRIVERS} ${DEVICES} ${VIRTUALMEM} ${MISCMODS} ${SYSTEM} ${DATASTRUCTS} ${CPUBITS} ${REALEMU} SUBMODULES = ${MODULES} ${FILESYSTEMS} ${VIDEODRIVERS} ${DEVICES} ${VIRTUALMEM} ${MISCMODS} ${SYSTEM} ${DATASTRUCTS} ${CPUBITS} ${REALEMU}
UTILITIES = util/bin/readelf util/bin/typewriter UTILITIES = util/bin/readelf util/bin/typewriter
EMU = qemu EMU = qemu-system-i386
GENEXT = genext2fs GENEXT = genext2fs
DD = dd conv=notrunc DD = dd conv=notrunc
BEG = util/mk-beg BEG = util/mk-beg

12
util/check-reqs
View File

@ -37,13 +37,7 @@ if [ -z `which genext2fs` ] ; then
BAIL BAIL
fi fi
if [ -z `which qemu` ] ; then if [ -z `which qemu-system-i386` ] ; then
if [ -z `which qemu-system-i386` ] ; then ERROR "Missing qemu"
ERROR "Missing qemu" INFO "You can probably install it from a package of the same name."
INFO "You can probably install it from a package of the same name."
fi
ERROR "qemu is installed, but not as 'qemu'"
INFO "You have a version of qemu which does not provide the 'qemu' binary."
INFO "You should run 'ln -s \`which qemu-system-i386\` ~bin' or similar to correct this."
fi fi

2
util/run-fullscreen.sh
View File

@ -6,4 +6,4 @@ KVM="-enable-kvm"
FULLSCREEN="-no-frame" FULLSCREEN="-no-frame"
RESOLUTION=`xrandr -q|perl -F'\s|,' -lane "/^Sc/&&print join '',@F[8..10]" | sed 's/x/=/'` RESOLUTION=`xrandr -q|perl -F'\s|,' -lane "/^Sc/&&print join '',@F[8..10]" | sed 's/x/=/'`
qemu -kernel toaruos-kernel -m $RAM -k en-us -append "vid=qemu=$RESOLUTION hdd" -serial stdio -vga std -hda toaruos-disk.img $KVM $FULLSCREEN qemu-system-i386 -kernel toaruos-kernel -m $RAM -k en-us -append "vid=qemu=$RESOLUTION hdd" -serial stdio -vga std -hda toaruos-disk.img $KVM $FULLSCREEN

2
util/run-tests.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
import subprocess, sys import subprocess, sys
q = subprocess.Popen(['qemu', '-kernel', 'toaruos-kernel', '-m', '256', q = subprocess.Popen(['qemu-system-i386', '-kernel', 'toaruos-kernel', '-m', '256',
'-serial', 'stdio', '-vga', 'std', '-hda', 'toaruos-disk.img', '-serial', 'stdio', '-vga', 'std', '-hda', 'toaruos-disk.img',
'-vnc', ':1', '-append', 'vgaterm hdd start=/bin/core-tests'], '-vnc', ':1', '-append', 'vgaterm hdd start=/bin/core-tests'],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)