morpheus

commit 38368e059f8aad4aa48ea9dc049761564e561246
parent bcea2d108f4475f2f8a152091cd3318bd807eef3
Author: sin <sin@2f30.org>
Date:   Wed, 25 Sep 2013 17:04:00 +0100

Clean up the build system a bit

Diffstat:
M
mkinitrd
 | 
2
+-
M
pkgbuild
 | 
2
--
M
qemu-run-initrd
 | 
4
+++-
M
stage0
 | 
2
--

4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/mkinitrd b/mkinitrd
@@ -2,4 +2,4 @@
 
 . ./prepare-env
 
-pushd $root && find . | cpio --quiet -H newc -o | gzip -9 -n > ../morpheus.img && popd
+pushd $root && find . | cpio --quiet -H newc -o | gzip -9 -n > ../morpheus-initrd.img && popd
diff --git a/pkgbuild b/pkgbuild
@@ -5,8 +5,6 @@ if test -z "$1"; then
 	exit 1
 fi
 
-set -e -x
-
 . ./prepare-env
 
 if [ $(uname -m) != $arch ]; then
diff --git a/qemu-run-initrd b/qemu-run-initrd
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. ./prepare-env
+
 vdesock="/tmp/morpheus-vde"
 
 ps -ef | grep vde_switch | grep "sock $vdesock" | grep -v grep > /dev/null || {
@@ -8,4 +10,4 @@ ps -ef | grep vde_switch | grep "sock $vdesock" | grep -v grep > /dev/null || {
 }
 
 qemu-system-x86_64 -enable-kvm -smp 2 -m 1024 -net nic,model=ne2k_pci \
-	-net vde,sock="${vdesock}" -kernel root/boot/bzImage -initrd morpheus.img -append "quiet"
+	-net vde,sock="${vdesock}" -kernel $root/boot/bzImage -initrd morpheus-initrd.img -append "quiet"
diff --git a/stage0 b/stage0
@@ -3,8 +3,6 @@
 # This is the stage0 script, it prepares a basic usable system
 # in $root.
 
-set -e -x
-
 . ./prepare-env
 
 if [ $(uname -m) != $arch ]; then