r1358 - in crux-2.2/ports/opt: . kqemu qemu - crux-commits

5 May 2006

Author: jheino
Date: 2006-05-05 15:08:09 +0200 (Fri, 05 May 2006)
New Revision: 1358

Added:
   crux-2.2/ports/opt/kqemu/
   crux-2.2/ports/opt/kqemu/.footprint
   crux-2.2/ports/opt/kqemu/.md5sum
   crux-2.2/ports/opt/kqemu/Pkgfile
   crux-2.2/ports/opt/kqemu/README
Removed:
   crux-2.2/ports/opt/qemu/README
Modified:
   crux-2.2/ports/opt/qemu/.footprint
   crux-2.2/ports/opt/qemu/.md5sum
   crux-2.2/ports/opt/qemu/Pkgfile
Log:
qemu: updated to version 0.8.1
kqemu: initial release


Added: crux-2.2/ports/opt/kqemu/.footprint
===================================================================

--- crux-2.2/ports/opt/kqemu/.footprint	                        (rev 0)
+++ crux-2.2/ports/opt/kqemu/.footprint	2006-05-05 13:08:09 UTC (rev 1358)
@@ -0,0 +1,5 @@
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/modules/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/
+drwxr-xr-x	root/root	lib/modules/<kernel-version>/misc/
+-rw-r--r--	root/root	lib/modules/<kernel-version>/misc/kqemu.ko

Added: crux-2.2/ports/opt/kqemu/.md5sum
===================================================================
--- crux-2.2/ports/opt/kqemu/.md5sum	                        (rev 0)
+++ crux-2.2/ports/opt/kqemu/.md5sum	2006-05-05 13:08:09 UTC (rev 1358)
@@ -0,0 +1 @@
+a1c449348cb162a4ab5d9ffcf2ceecc2  kqemu-1.3.0pre6.tar.gz

Added: crux-2.2/ports/opt/kqemu/Pkgfile
===================================================================
--- crux-2.2/ports/opt/kqemu/Pkgfile	                        (rev 0)
+++ crux-2.2/ports/opt/kqemu/Pkgfile	2006-05-05 13:08:09 UTC (rev 1358)
@@ -0,0 +1,17 @@
+# Description: QEMU Accelerator Module
+# URL:         http://fabrice.bellard.free.fr/qemu/qemu-accel.html
+# Maintainer:  Jukka Heino, jukka dot heino at gmail dot com
+# Packager:    Jukka Heino, jukka dot heino at gmail dot com
+# Depends on:  
+
+name=kqemu
+version=1.3.0pre6
+release=1
+source=(http://fabrice.bellard.free.fr/qemu/$name-$version.tar.gz)
+
+build() {
+	cd $name-$version
+	./configure
+	make
+	install -D -m 0644 $name.ko $PKG/lib/modules/$(uname -r)/misc/kqemu.ko
+}

Copied: crux-2.2/ports/opt/kqemu/README (from rev 1357, crux-2.2/ports/opt/qemu/README)
===================================================================
--- crux-2.2/ports/opt/kqemu/README	                        (rev 0)
+++ crux-2.2/ports/opt/kqemu/README	2006-05-05 13:08:09 UTC (rev 1358)
@@ -0,0 +1,19 @@
+REQUIREMENTS
+
+PRE-INSTALL
+
+POST-INSTALL
+
+In order to use the QEMU Accelerator Module, first enable /dev/shm in
+/etc/fstab. This is the area kqemu uses for the virtual machine RAM.
+
+When using udev, the device node is created automatically; add the following to
+/etc/udev/rules.d/10-custom.rules to allow all users of group 'qemu' to use
+kqemu:
+
+  KERNEL="kqemu", MODE="0660", GROUP="qemu"
+
+Loading the kqemu kernel module is done with "modprobe kqemu major=0" This will
+cause the major number to be assigned dynamically.
+
+PRECAUTION

Modified: crux-2.2/ports/opt/qemu/.footprint
===================================================================
--- crux-2.2/ports/opt/qemu/.footprint	2006-05-05 05:28:20 UTC (rev 1357)
+++ crux-2.2/ports/opt/qemu/.footprint	2006-05-05 13:08:09 UTC (rev 1358)
@@ -1,16 +1,7 @@
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/modules/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/misc/
--rwxr-xr-x	root/root	lib/modules/<kernel-version>/misc/kqemu.ko
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/qemu
 -rwxr-xr-x	root/root	usr/bin/qemu-img
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rwxr-xr-x	root/root	usr/man/man1/qemu-img.1.gz
--rwxr-xr-x	root/root	usr/man/man1/qemu.1.gz
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/qemu/
 -rw-r--r--	root/root	usr/share/qemu/bios.bin

Modified: crux-2.2/ports/opt/qemu/.md5sum
===================================================================
--- crux-2.2/ports/opt/qemu/.md5sum	2006-05-05 05:28:20 UTC (rev 1357)
+++ crux-2.2/ports/opt/qemu/.md5sum	2006-05-05 13:08:09 UTC (rev 1358)
@@ -1,6 +1,5 @@
-02cfdecda90458d6393781496ec6b48b  kqemu-0.7.2.tar.gz
 4860921fbf6a928cf0e132ecc5e43dcc  qemu-0.7.0-gcc4.patch
 88fd85405713717ef7c239acfa4720f0  qemu-0.7.2-dyngen-check-stack-clobbers.patch
 aaa22a7297ac7685cb462e3ec1668e79  qemu-0.7.2-gcc4-opts.patch
 cb2b0532b6eab6f80c14b33cfba70662  qemu-0.8.0-gcc4-hacks.patch
-eb175b26583280706fe7e4d8910d320d  qemu-0.8.0.tar.gz
+67d924324a5ab79d017bd97a1e767285  qemu-0.8.1.tar.gz

Modified: crux-2.2/ports/opt/qemu/Pkgfile
===================================================================
--- crux-2.2/ports/opt/qemu/Pkgfile	2006-05-05 05:28:20 UTC (rev 1357)
+++ crux-2.2/ports/opt/qemu/Pkgfile	2006-05-05 13:08:09 UTC (rev 1358)
@@ -1,14 +1,14 @@
-# Description: Fast CPU emulator and virtualizer
-# URL: http://fabrice.bellard.free.fr/qemu/
-# Maintainer: Jukka Heino, jukka dot heino at gmail dot com
-# Packager: Jukka Heino, jukka dot heino at gmail dot com
-# Depends on: libsdl
+# Description:  Fast CPU emulator and virtualizer
+# URL:          http://fabrice.bellard.free.fr/qemu/
+# Maintainer:   Jukka Heino, jukka dot heino at gmail dot com
+# Packager:     Jukka Heino, jukka dot heino at gmail dot com
+# Depends on:   libsdl
+# Nice to have: kqemu
 
 name=qemu
-version=0.8.0
-release=2
+version=0.8.1
+release=1
 source=(http://fabrice.bellard.free.fr/$name/$name-$version.tar.gz \
-	http://fabrice.bellard.free.fr/$name/kqemu-0.7.2.tar.gz \
 	$name-0.7.0-gcc4.patch \
 	$name-0.7.2-dyngen-check-stack-clobbers.patch \
 	$name-0.7.2-gcc4-opts.patch \
@@ -16,7 +16,6 @@
 
 build() {
 	cd $name-$version
-	mv $SRC/kqemu .
 
 	patch -p1 -i $SRC/$name-0.7.0-gcc4.patch
 	patch -p1 -i $SRC/$name-0.7.2-dyngen-check-stack-clobbers.patch
@@ -24,16 +23,11 @@
 	patch -p1 -i $SRC/$name-0.8.0-gcc4-hacks.patch
 
 	./configure --prefix=/usr \
-		--enable-adlib \
-		--target-list=i386-softmmu \
-		--disable-gcc-check
-	make
+	            --enable-adlib \
+	            --target-list=i386-softmmu \
+	            --disable-gcc-check
 
-	sed -i 's:cd kqemu ; ./install.sh::' Makefile
-	make bindir=$PKG/usr/bin datadir=$PKG/usr/share/qemu \
-		docdir=$PKG/usr/share/doc mandir=$PKG/usr/man install
-	install -D -m 0755 kqemu/kqemu.ko \
-		$PKG/lib/modules/`uname -r`/misc/kqemu.ko
-	
+	make
+	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/share/doc
 }

Deleted: crux-2.2/ports/opt/qemu/README
===================================================================
--- crux-2.2/ports/opt/qemu/README	2006-05-05 05:28:20 UTC (rev 1357)
+++ crux-2.2/ports/opt/qemu/README	2006-05-05 13:08:09 UTC (rev 1358)
@@ -1,33 +0,0 @@
-REQUIREMENTS
-
-PRE-INSTALL
-
-POST-INSTALL
-
-In order to use the QEMU Accelerator Module, first enable /dev/shm in
-/etc/fstab. This is the area kqemu uses for the virtual machine RAM.
-
-devfs users
------------
-
-To get the /dev/kqemu node, add the following lines to /etc/devfsd.conf:
-
-  LOOKUP		^kqemu$		EXECUTE /bin/mknod -m 0666 $devpath c 250 0
-
-After this you need to load the kqemu kernel module either in
-/etc/rc.modules or manually.
-
-udev users
-----------
-
-When using udev, the device node is created automatically; add the 
-following to /etc/udev/rules.d/10-custom.rules to allow all users of group 
-'qemu' use kqemu:
-
-  KERNEL="kqemu", MODE="0660", GROUP="qemu"
-
-Loading the kqemu kernel module is done like in devfs except you have to use
-major=0 as a parameter for the module (i.e. "modprobe kqemu major=0"). This will
-cause the major number to be assigned dynamically.
-
-PRECAUTION

    

r1358 - in crux-2.2/ports/opt: . kqemu qemu

crux＠crux.nu

tags

participants (1)