Stefan Fiedler:

package/daja77/qemu/config.in → package/daja77/kqemu/kqemu.conf

@@ -5,7 +5,7 @@
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
-# ROCK Linux: rock-src/package/daja77/qemu/config.in
+# ROCK Linux: rock-src/package/daja77/qemu/qemu.conf
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -20,14 +20,4 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck qemu X
-then
-	 menu_begin MENU_PKG_QEMU 'qemu package options'
-	 	 comment 'Please note that the accelerator module is not GPLed.'
-	 	 comment 'Permission was given by Fabrice Bellard to distribute it with ROCK Linux.'
-	 	 comment 'If you plan to give away the distribution you build using ROCK Linux,'
-		 comment 'you have to ask Fabrice Bellard for authorisation.'
-	 	 bool 'Build the accelerator kernel module (kqemu)' \
-		 	 ROCKCFG_PKG_QEMU_KQEMU 0
-	 menu_end
-fi
+hook_add preconf 4 "sed -i -e 's,\(/sbin/depmod\),echo \1,' install.sh"

package/daja77/kqemu/kqemu.desc

@@ -0,0 +1,46 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/daja77/qemu/qemu.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] QEMU accelerator kernel module
+
+[T] QEMU is a FAST! processor emulator using dynamic translation to achieve good 
+[T] emulation speed.
+[T] Please note: Although the qemu is GPL, the accelerator module is not.
+[T]   Redistribution of the acellerator module was granted for ROCK-Linux as of 
+[T]   05/25/2005, provided it is free of charge. If you create a distribution 
+[T]   for sale, please contact the author about terms of license for the
+[T]   acellerator, or disable building it.
+
+[U] http://fabrice.bellard.free.fr/qemu/
+
+[A] Fabrice Bellard <fabrice@bellard.org>
+[M] Daniel Jahre <rock@lospalmos.net>
+
+[C] extra/emulator
+
+[L] Commercial
+[S] Stable
+[V] 1.3.0pre7
+[P] O -?---5---9 208.900
+
+[D] 0 kqemu-1.3.0pre7.tar.gz http://fabrice.bellard.free.fr/qemu/

package/daja77/qemu/config.hlp

@@ -1,5 +0,0 @@
-ROCKCFG_PKG_QEMU_KQEMU
-  Please note that the accelerator module is not GPLed.
-  Permission was given by Fabrice Bellard to distribute it with ROCK Linux.
-  If you plan to give away the distribution you build using ROCK Linux,
-  you have to ask Fabrice Bellard for authorisation.

package/daja77/qemu/errno-fix.patch

@@ -1,13 +0,0 @@
-
-see http://lists.nongnu.org/archive/html/qemu-devel/2006-02/msg00174.html
-
---- qemu.org/target-i386/helper2.c      2005-12-04 19:46:06.000000000 +0100
-+++ qemu/target-i386/helper2.c  2006-02-18 22:50:37.362222345 +0100
-@@ -24,6 +24,7 @@
- #include <inttypes.h>
- #include <signal.h>
- #include <assert.h>
-+#include <errno.h>
- 
- #include "cpu.h"
- #include "exec-all.h"

package/daja77/qemu/program-headers-hotfix.patch

@@ -1,10 +0,0 @@
---- qemu-0.8.0-p/Makefile.target~	2006-03-25 19:16:56.000000000 +0100
-+++ qemu-0.8.0-p/Makefile.target	2006-03-25 19:17:17.000000000 +0100
-@@ -68,6 +68,7 @@
- ifeq ($(ARCH),i386)
- CFLAGS+=-fomit-frame-pointer
- OP_CFLAGS=$(CFLAGS) -mpreferred-stack-boundary=2
-+LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386.ld
- ifeq ($(HAVE_GCC3_OPTIONS),yes)
- OP_CFLAGS+= -falign-functions=0 -fno-gcse
- else

package/daja77/qemu/qemu.conf

@@ -20,15 +20,24 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-srctar="qemu-$ver.tar.bz2"
-if [ "$ROCKCFG_PKG_QEMU_KQEMU" = 1 ] ; then
-		hook_add preconf 3 "tar $taropt $archdir/kqemu-$kqemuver.tar.bz2"
-		hook_add preconf 4 "sed -i -e 's,\(/sbin/depmod\),echo \1,' kqemu/install.sh"
-		splitdesc_accelerator() { desc_I="Qemu accelerator kernel module"; }
-		splitreg 10 accelerator lib/modules
+
+prefer_progver ()
+{
+	local P
+	for P ; do
+		type -p "$P" >/dev/null && { echo "$P" ; break ; }
+	done
+	return
+}
+
+preferred_gcc="`prefer_progver gcc-34 gcc-33 gcc-32 gcc-2`"
+
+if [ -n "$preferred_gcc" ] ; then
+	CC="$preferred_gcc" ; HOST_CC="$preferred_gcc"
+	var_append confopt ' ' "--cc=\"$preferred_gcc\" --host-cc=\"$preferred_gcc\""
 fi
 
 # hotfix for the build error:
 # 	Not enough room for program headers
 # see: http://kidsquid.com/cgi-bin/moin.cgi/FrequentlyAskedQuestions#head-c61865168f151dc29f1d5c23faa2b4a02c5ec73c
-hook_add premake 3 "sed -i -e "s,SIZEOF_HEADERS,0x400,g" *.ld"
+#hook_add premake 3 "sed -i -e "s,SIZEOF_HEADERS,0x400,g" *.ld"

package/daja77/qemu/qemu.desc

@@ -40,9 +40,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.8.0
+[V] 0.8.1
 [P] X -?---5---9 208.800
 
-[D] 3936583336 qemu-0.8.0.tar.gz http://fabrice.bellard.free.fr/qemu/
-[D] 3329474894 kqemu-0.7.2.tar.gz http://fabrice.bellard.free.fr/qemu/
-[O] kqemuver=0.7.2
+[D] 0 qemu-0.8.1.tar.gz http://fabrice.bellard.free.fr/qemu/