Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=91e34591aff8722ed0b6fa6a568162998beb618a

commit 91e34591aff8722ed0b6fa6a568162998beb618a
Author: James Buren <[email protected]>
Date:   Wed Oct 22 15:17:34 2014 -0500

fvbe: remove qemu half-baked work

diff --git a/Makefile b/Makefile
index 815c04a..8bd9444 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,6 @@ bin/fwsetup: $(OBJECTS)
bin/resolvegroups: src/resolvegroups.o
cc -lpacman $^ -o $@

-bin/qemu-exit: src/qemu-exit.o
-       cc $^ -o $@
-
setup: bin/fwsetup

install: bin/fwsetup
diff --git a/bin/init b/bin/init
deleted file mode 100644
index 0bb8a1d..0000000
--- a/bin/init
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-bad_exit()
-{
-  echo "Build has failed!"
-  qemu-exit
-}
-
-good_exit()
-{
-  echo "Build has finished!"
-  qemu-exit
-}
-
-trap bad_exit ERR
-trap good_exit EXIT
-
-ROOT="/root"
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-export PATH
-
-if ! test -c /dev/zero; then
-  mount -t devtmpfs none /dev
-fi
-
-if ! test -d /sys/kernel; then
-  mount -t sysfs none /sys
-fi
-
-if ! test -d /proc/self; then
-  mount -t proc none /proc
-fi
-
-if ! test -d "$ROOT"; then
-  mkdir -p -m 0755 "$ROOT"
-fi
-
-if ! test -d /dev/pts; then
-  mkdir -p -m 0755 /dev/pts
-  mount -t devpts -o gid=5,mode=620 none /dev/pts
-fi
-
-if ! test -d /dev/shm; then
-  mkdir -p -m 0755 /dev/shm
-  mount -t tmpfs none /dev/shm
-fi
-
diff --git a/bin/prepare-qemu-files b/bin/prepare-qemu-files
deleted file mode 100755
index 0ed90ca..0000000
--- a/bin/prepare-qemu-files
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. ./fvbe.conf
-
-KERNEL="/boot/vmlinuz"
-INITRD="/boot/initrd"
-
-if [ ! -f "$KERNEL" ]; then
-       echo "$KERNEL is missing."
-       exit 1
-fi
-
-if [ ! -f "$INITRD" ]; then
-       echo "$INITRD is missing."
-       exit 1
-fi
-
-if [ "$(id -u)" -ne 0 -a -z "$FAKEROOTKEY" ]; then
-       echo "You must run this as root or use fakeroot."
-       exit 1
-fi
-
-rm -rf $FVBE_ROOT qemu-kernel qemu-initrd
-
-mkdir -p $FVBE_ROOT
-
-cd $FVBE_ROOT
-
-xz -d < "$INITRD" | cpio --extract --preserve-modification-time
-
-install -m 0755 ../bin/init init
-install -m 0755 ../bin/qemu-exit sbin/qemu-exit
-
-find . | cpio --create -R 0:0 -H newc | xz --check=crc32 --lzma2=dict=1MiB > 
../qemu-initrd
-
-cd ..
-
-cp "$KERNEL" qemu-kernel
-
-rm -rf $FVBE_ROOT
diff --git a/src/qemu-exit.c b/src/qemu-exit.c
deleted file mode 100644
index 57f9d4b..0000000
--- a/src/qemu-exit.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <unistd.h>
-#include <sys/reboot.h>
-
-int main(void)
-{
-  sync();
-
-  reboot(RB_POWER_OFF);
-
-  return 0;
-}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to