Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (842ccd5c1d1a330f20fd0c70c44c92266490fb69)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (842ccd5c1d1a330f20fd0c70c44c92266490fb69)
  • Date: Sat, 7 Mar 2009 13:26:30 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 3 +
dev/null |binary
kernels/kqemu/BUILD | 4 +
kernels/kqemu/DETAILS | 30 +++++++-------
kernels/kqemu/HISTORY | 7 ++-
kernels/kqemu/INSTALL | 10 ++--
kernels/kqemu/PRE_BUILD | 9 +---
kernels/kqemu/ftbfs-linux-2.6.22.patch | 15 +++++++
kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig | 0
kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch | 16 -------
kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig |binary
utils/qemu/BUILD | 15 ++-----
utils/qemu/CONFIGURE | 29 +++++++------
utils/qemu/DEPENDS | 21 ++++-----
utils/qemu/DETAILS | 21 +++++----
utils/qemu/HISTORY | 8 +++
utils/qemu/PRE_BUILD | 2
utils/qemu/archs | 47
++++++++++++++--------
utils/qemu/qemu-0.9.1.tar.gz.sig | 0
utils/qemu/qemu.gpg |binary
utils/qemulator/BUILD | 1
utils/qemulator/DEPENDS | 2
utils/qemulator/DETAILS | 20 +++++++++
utils/qemulator/HISTORY | 2
utils/qemulator/INSTALL | 1
25 files changed, 162 insertions(+), 101 deletions(-)

New commits:
commit 842ccd5c1d1a330f20fd0c70c44c92266490fb69
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qemulator: new spell, comfortable GUI for the qemu virtual engine

commit 50f36e011ad60129431b9b03ac9fbc90b6d49790
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qemu: => 0.10.0

commit a52652316e1f221c7d9747ef7f05c4f9c7a3d014
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

kqemu: => 1.4.0pre1

diff --git a/ChangeLog b/ChangeLog
index 47777bc..13bc876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/qemulator: new spell, comfortable GUI for the qemu virtual
engine
+
2009-03-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* kde4-apps/bibletime4: new spell, kde4 version of bibletime

diff --git a/kernels/kqemu/BUILD b/kernels/kqemu/BUILD
index 2fe79df..6a1a8c1 100755
--- a/kernels/kqemu/BUILD
+++ b/kernels/kqemu/BUILD
@@ -1,4 +1,6 @@
OPTS="--kernel-path=$INSTALL_ROOT/usr/src/linux-$(get_kernel_version) \
$OPTS" &&

-default_build
+make_single &&
+default_build &&
+make_normal
diff --git a/kernels/kqemu/DETAILS b/kernels/kqemu/DETAILS
index 8d39c3c..fd78d3f 100755
--- a/kernels/kqemu/DETAILS
+++ b/kernels/kqemu/DETAILS
@@ -1,27 +1,27 @@
SPELL=kqemu
- VERSION=1.3.0pre11
+ VERSION=1.4.0pre1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/kqemu-$VERSION
- SOURCE_URL[0]=http://bellard.org/qemu/${SOURCE}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://www.nongnu.org/qemu/$SOURCE
DISTCC_HOSTS=
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
- LICENSE[0]=GPL2
- WEB_SITE=http://bellard.org/qemu/
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
+ LICENSE[0]=GPL
+ WEB_SITE=http://www.nongnu.org/qemu/
ENTERED=20060126
- SHORT="QEMU is a generic and open source processor emulator"
+ SHORT="QEMU accelerator module"
cat << EOF
QEMU achieves a good emulation speed by using dynamic translation.
QEMU has two operating modes:

- * Full system emulation. In this mode, QEMU emulates a full system
- (for example a PC), including a processor and various peripherials.
- It can be used to launch different Operating Systems without
- rebooting the PC or to debug system code.
- * User mode emulation (Linux host only). In this mode, QEMU can
- launch Linux processes compiled for one CPU on another CPU.
+* Full system emulation. In this mode, QEMU emulates a full system (for
example
+ a PC), including a processor and various peripherials. It can be used to
+ launch different Operating Systems without rebooting the PC or to debug
system
+ code.
+* User mode emulation (Linux host only). In this mode, QEMU can launch Linux
+ processes compiled for one CPU on another CPU.

-KQEMU is the kernel accelerator module for qemu. Substantially improves
-performance.
+KQEMU is the kernel accelerator module for qemu.
+Substantially improves performance.

Emulator : Typical Slowdown Ratio
QEMU : between 5 and 10
diff --git a/kernels/kqemu/HISTORY b/kernels/kqemu/HISTORY
index a5d87fa..ab6101f 100644
--- a/kernels/kqemu/HISTORY
+++ b/kernels/kqemu/HISTORY
@@ -1,3 +1,9 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.0pre1; cleaned up
+ * BUILD: fixed multijob build
+ * PRE_BUILD: `uname -r' is still more correct
+ * ftbfs-linux-2.6.22.patch: renamed to
+
2008-08-10 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: fixed SOURCE_URL[0] and WEB_SITE

@@ -64,4 +70,3 @@

2005-11-02 Andreas van Ruth <avr AT gnulinux.nl>
* BUILD, DEPENDS, DETAILS, HISTORY: created
-
diff --git a/kernels/kqemu/INSTALL b/kernels/kqemu/INSTALL
index d920e42..fead378 100755
--- a/kernels/kqemu/INSTALL
+++ b/kernels/kqemu/INSTALL
@@ -1,5 +1,7 @@
-default_install &&
-#not everyone uses udev
-if spell_installed udev ; then
-echo 'KERNEL=="kqemu", NAME="%k", MODE="0666"' >
${INSTALL_ROOT}/etc/udev/rules.d/60-kqemu.rules
+default_install &&
+
+# not everyone uses udev
+if spell_installed udev; then
+ echo 'KERNEL=="kqemu", NAME="%k", MODE="0666"' > \
+ "$INSTALL_ROOT/etc/udev/rules.d/60-kqemu.rules"
fi
diff --git a/kernels/kqemu/PRE_BUILD b/kernels/kqemu/PRE_BUILD
index 98f551b..fd3e2d1 100755
--- a/kernels/kqemu/PRE_BUILD
+++ b/kernels/kqemu/PRE_BUILD
@@ -1,5 +1,4 @@
-default_pre_build
&&
-cd "$SOURCE_DIRECTORY"
&&
-patch -Np1 < "$SCRIPT_DIRECTORY/kqemu-1.3.0pre11_linux-2.6.22.patch"
&&
-sedit "s:\`uname -r\`:$(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
&&
-sedit "s:depmod -a:& $(get_kernel_version):" $SOURCE_DIRECTORY/install.sh
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/ftbfs-linux-2.6.22.patch"
diff --git a/kernels/kqemu/ftbfs-linux-2.6.22.patch
b/kernels/kqemu/ftbfs-linux-2.6.22.patch
new file mode 100644
index 0000000..1f220c1
--- /dev/null
+++ b/kernels/kqemu/ftbfs-linux-2.6.22.patch
@@ -0,0 +1,15 @@
+## From Debian's kqemu-source package:
+## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
+##
+## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
+
+--- kqemu-linux.c.orig 2007-02-06 21:02:00.000000000 +0000
++++ kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include <linux/ioctl.h>
+ #include <linux/smp_lock.h>
+ #include <linux/miscdevice.h>
++#include <linux/sched.h>
+ #include <asm/atomic.h>
+ #include <asm/processor.h>
+ #include <asm/uaccess.h>
diff --git a/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig
b/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig
deleted file mode 100644
index 4e1330f..0000000
Binary files a/kernels/kqemu/kqemu-1.3.0pre11.tar.gz.sig and /dev/null differ
diff --git a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
b/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
deleted file mode 100644
index 9735d2c..0000000
--- a/kernels/kqemu/kqemu-1.3.0pre11_linux-2.6.22.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-## From Debian's kqemu-source package:
-## 03-2.5.22.dpatch by Samuel Tardieu <sam AT rfc1149.net>
-##
-## DP: Fix FTBFS with linux 2.6.22 (Closes: #434031).
-
-diff -Naur kqemu-1.3.0pre11.orig/kqemu-linux.c kqemu-1.3.0pre11/kqemu-linux.c
---- kqemu-1.3.0pre11.orig/kqemu-linux.c 2007-02-06 21:02:00.000000000
+0000
-+++ kqemu-1.3.0pre11/kqemu-linux.c 2007-07-24 05:41:14.000000000 +0000
-@@ -26,6 +26,7 @@
- #include <linux/ioctl.h>
- #include <linux/smp_lock.h>
- #include <linux/miscdevice.h>
-+#include <linux/sched.h>
- #include <asm/atomic.h>
- #include <asm/processor.h>
- #include <asm/uaccess.h>
diff --git a/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig
b/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig
new file mode 100644
index 0000000..06011d7
Binary files /dev/null and b/kernels/kqemu/kqemu-1.4.0pre1.tar.gz.sig differ
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index cc57713..385683b 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,4 +1,4 @@
-message "Target list:$QEMU_ARCHS" &&
+message "Target list: $QEMU_ARCHS" &&

#
# Disable PIC if building soft MMU targets
@@ -6,7 +6,8 @@ message "Target list:$QEMU_ARCHS" &&
# generally shrinking march down to pentium-mmx
#
if grep -q softmmu <<< "$QEMU_ARCHS"; then
- message "${MESSAGE_COLOR}Qemu 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
+ # we need to check does 0.10 act the same way
+ message "${MESSAGE_COLOR}QEMU 0.9 has a build problem with advanced
CFLAGS.${DEFAULT_COLOR}" &&
message "${MESSAGE_COLOR}Trying to make it work, starting with removal of
any sse flags.${DEFAULT_COLOR}" &&
# sse seems to be bad; -march=pentium -m3dnow worked, though
list_remove CFLAGS -msse -msse2 -msse3 -mfpmath=sse &&
@@ -30,12 +31,8 @@ if grep -q softmmu <<< "$QEMU_ARCHS"; then
disable_pic
fi &&

-
-./configure --prefix=$INSTALL_ROOT/usr \
- --target-list="$QEMU_ARCHS" \
- $OPTS &&
-# --build=$BUILD \
-# --sysconfdir=$INSTALL_ROOT/etc \
-# --localstatedir=$INSTALL_ROOT/var \
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --target-list="$QEMU_ARCHS" \
+ $OPTS &&

make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index b061430..1f14d85 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,18 +1,21 @@
- local QEMU_ARCH_LIST &&
- persistent_add QEMU_ARCHS &&
- QEMU_ARCH_LIST=`cat $SCRIPT_DIRECTORY/archs` &&
- BACKTITLE="Qemu Archs Configuration" &&
- TITLE="Arch Selection" &&
- HELP="Select Arch you want to build qemu" &&
+local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
+
+persistent_add QEMU_ARCHS &&
+
+BACKTITLE="Qemu Archs Configuration" &&
+ TITLE="Arch Selection" &&
+ HELP="Select Arch you want to build qemu" &&
+
# deliberately uses query, see locale CONFIGURE note
if query "Handpick architectures to emulate (y/n)?" n; then
- QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
- --title "$TITLE" \
- --stdout \
- --checklist "$HELP" \
- 0 0 0 \
- $QEMU_ARCH_LIST`
+ QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --checklist "$HELP" \
+ 0 0 0 \
+ $QEMU_ARCH_LIST`
fi &&
+
if [[ -z $QEMU_ARCHS ]]; then
- QEMU_ARCHS=$(cut -f 1 $SCRIPT_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
+ QEMU_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
fi
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 1afe8ca..1aa6dfc 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,12 +1,11 @@
-depends gcc34 &&
-depends sdl &&
+optional_depends sdl \
+ "" "--disable-sdl" \
+ "for SDL support" &&

-optional_depends alsa-lib \
- '--enable-alsa' \
- '--disable-alsa' \
- 'for Advanced Linux Sound Architecture driver support' &&
-# Qemu configure script doesn't accept --enable-kqemu .
-optional_depends kqemu \
- '' \
- '--disable-kqemu' \
- 'for kernel acceleration support'
+optional_depends bluez \
+ "" "--disable-bluez" \
+ "for Bluetooth support" &&
+
+optional_depends kqemu \
+ "" "--disable-kqemu" \
+ "for kernel acceleration support"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 9d8fccb..6ba4fb7 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,19 +1,22 @@
SPELL=qemu
- VERSION=0.9.1
+ VERSION=0.10.0
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://bellard.org/qemu/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-# SOURCE_HASH=sha512:
+ SOURCE2=$SOURCE.sig
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+ SOURCE2_URL[0]=$SOURCE_URL.sig
+ SOURCE_GPG=qemu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
DISTCC_HOSTS=
- GCC_VERSION=3.4
- LICENSE[0]=GPL/LGPL
- WEB_SITE=http://bellard.org/qemu/
+ LICENSE[0]=GPL
+ LICENSE[1]=LGPL
+ WEB_SITE=http://www.nongnu.org/qemu/
KEYWORDS="emulator utils"
ENTERED=20051102
- SHORT="QEMU is a generic and open source processor emulator"
+ SHORT="generic and open source processor emulator"
cat << EOF
QEMU achieves a good emulation speed by using dynamic translation.
+
QEMU has two operating modes:

* Full system emulation. In this mode, QEMU emulates a full system
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index b89e044..b7f46e6 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,11 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: 0.10.0; switched to upstream pgp key; cleaned up
+ * DEPENDS: sdl _is_ optional; gcc dep is useless; added missing deps;
+ cleaned up
+ * BUILD, CONFIGURE: cleaned up
+ * PRE_BUILD: removed
+ * archs: updated arch specs
+
2008-06-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new url & website

diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
deleted file mode 100755
index 5750a71..0000000
--- a/utils/qemu/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-invoke_gcc
diff --git a/utils/qemu/archs b/utils/qemu/archs
index c0edfd8..1b295fe 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,15 +1,32 @@
-i386-linux-user i386 on
-arm-linux-user arm on
-armeb-linux-user armeb on
-m68k-linux-user m68k on
-mips-linux-user mips on
-mipsel-linux-user mipsel on
-ppc-linux-user ppc on
-sparc-linux-user sparc on
-i386-softmmu i386-sofmmu on
-ppc-softmmu ppc-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
-mips-softmmu mips-softmmu on
-mipsel-softmmu mipsel-softmmu on
-arm-softmmu arm-softmmu on
+alpha-linux-user alpha on
+i386-linux-user i386 on
+arm-linux-user arm on
+armeb-linux-user armeb on
+cris-linux-user cris on
+m68k-linux-user m68k on
+mips-linux-user mips on
+mipsel-linux-user mipsel on
+ppc-linux-user ppc on
+ppc64-linux-user ppc64 on
+ppc64abi32-linux-user ppc64abi32 on
+sparc-linux-user sparc on
+sparc32plus-linux-user sparc32plus on
+sparc64-linux-user sparc64 on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb on
+x86_64-linux-user x86_64 on
+i386-softmmu i386-sofmmu on
+ppc-softmmu ppc-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+ppc64-softmmu ppc64-softmmu on
+sparc-softmmu sparc-softmmu on
+x86_64-softmmu x86_64-softmmu on
+mips-softmmu mips-softmmu on
+mipsel-softmmu mipsel-softmmu on
+mips64-softmmu mips64-softmmu on
+mips64el-softmmu mips64el-softmmu on
+arm-softmmu arm-softmmu on
+m68k-softmmu m68k-softmmu on
+cris-softmmu cris-softmmu on
+sh4-softmmu sh4-softmmu on
+sh4eb-softmmu sh4eb-softmmu on
diff --git a/utils/qemu/qemu-0.9.1.tar.gz.sig
b/utils/qemu/qemu-0.9.1.tar.gz.sig
deleted file mode 100644
index b84972f..0000000
Binary files a/utils/qemu/qemu-0.9.1.tar.gz.sig and /dev/null differ
diff --git a/utils/qemu/qemu.gpg b/utils/qemu/qemu.gpg
new file mode 100644
index 0000000..aa9da3d
Binary files /dev/null and b/utils/qemu/qemu.gpg differ
diff --git a/utils/qemulator/BUILD b/utils/qemulator/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/utils/qemulator/BUILD
@@ -0,0 +1 @@
+true
diff --git a/utils/qemulator/DEPENDS b/utils/qemulator/DEPENDS
new file mode 100755
index 0000000..7853ee1
--- /dev/null
+++ b/utils/qemulator/DEPENDS
@@ -0,0 +1,2 @@
+depends qemu &&
+depends pygtk2
diff --git a/utils/qemulator/DETAILS b/utils/qemulator/DETAILS
new file mode 100755
index 0000000..0d67cc1
--- /dev/null
+++ b/utils/qemulator/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=qemulator
+ VERSION=0.5
+ SOURCE=Qemulator-$VERSION.tar.gz
+ SOURCE_URL[0]=http://qemulator.createweb.de/downloads/$SOURCE
+
SOURCE_HASH=sha512:7bda884662061dbddfaaee82352c3b16f7da39fb6bd9970b019361b0c8f9a651f434dcac3c6bbbac62c6389fcfbaef41d4424cc9b4b9ea8dcef1d37ed4b58551
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/Qemulator-$VERSION"
+ WEB_SITE=http://qemulator.createweb.de/
+ LICENSE[0]=GPL
+ ENTERED=20090307
+ SHORT="comfortable GUI for the qemu virtual engine"
+cat << EOF
+Qemulator is a full featured emulation suite for the qemu virtual engine,
+with on demand job control. Qemulator provides an easy and fast to use image
+and device management, a "My machines" list and interactive job control.
+
+It comes with a list of all running jobs from where you can open the contol
+panel for each job and performing on demand action. Full interaction for
+mounted volumes, usb devices, keyboard and mouse interaction, screenshots,
+wave capture and save/restore machine state and open vnc viewer is provided.
+EOF
diff --git a/utils/qemulator/HISTORY b/utils/qemulator/HISTORY
new file mode 100644
index 0000000..d014ff3
--- /dev/null
+++ b/utils/qemulator/HISTORY
@@ -0,0 +1,2 @@
+2009-03-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL: spell created
diff --git a/utils/qemulator/INSTALL b/utils/qemulator/INSTALL
new file mode 100755
index 0000000..082fbaf
--- /dev/null
+++ b/utils/qemulator/INSTALL
@@ -0,0 +1 @@
+cp -av usr/local/* "$INSTALL_ROOT/usr"



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (842ccd5c1d1a330f20fd0c70c44c92266490fb69), Vlad Glagolev, 03/07/2009

Archive powered by MHonArc 2.6.24.

Top of Page