Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (841eaf9752db304c80e2a637cbda9898ba3b5fdd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vasil Yonkov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (841eaf9752db304c80e2a637cbda9898ba3b5fdd)
  • Date: Wed, 20 Jan 2010 13:10:22 -0600

GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

utils/qemu/BUILD | 75 ++++++++++++++-----------
utils/qemu/CONFIGURE | 20 +++++-
utils/qemu/DEPENDS | 112
++++++++++++++++++++++++++++++++++----
utils/qemu/DETAILS | 23 ++++++-
utils/qemu/HISTORY | 8 ++
utils/qemu/PREPARE | 2
utils/qemu/qemu-0.11.1.tar.gz.sig |binary
utils/qemu/qemu-0.12.2.tar.gz.sig |binary
8 files changed, 190 insertions(+), 50 deletions(-)

New commits:
commit 841eaf9752db304c80e2a637cbda9898ba3b5fdd
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

qemu: added versions 0.11.1 and 0.12.2
added queries for supported audio systems and emulated audio cards
added option for KVM support
added ncurses, gnutls, curl, LIBSASL, bridge-utils and iproute2 as
optional dependencies

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 385683b..91c29cd 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,38 +1,47 @@
-message "Target list: $QEMU_ARCHS" &&
+message "Target list: $QEMU_ARCHS" &&

-#
-# Disable PIC if building soft MMU targets
-# Pentium3/4 or athlon(-xp) breaks on building soft MMU
-# generally shrinking march down to pentium-mmx
-#
-if grep -q softmmu <<< "$QEMU_ARCHS"; then
- # 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 &&
- if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
+if [[ $QEMU_VER == "0.10.6" ]] || [[ $QEMU_VER == "0.11.1" ]]; then
+ if [[ ! $OPTS =~ "--disable-kqemu" ]]; then
+ #
+ # Disable PIC if building soft MMU targets
+ # Pentium3/4 or athlon(-xp) breaks on building soft MMU
+ # generally shrinking march down to pentium-mmx
+ #
+ if grep -q softmmu <<< "$QEMU_ARCHS"; then
+ # we need to check does 0.10 act the same way
+ message "${MESSAGE_COLOR}QEMU $QEMU_VER 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 &&
+ if [[ "$CFLAGS" =~ -march=pentium[^[:space:]]+ ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=pentium-mmx"
+ fi &&

- # -march=prescott was added after
- if [[ "$CFLAGS" =~ -march=prescott ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=pentium-mmx"
- fi &&
- if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
- message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
- list_remove CFLAGS $BASH_REMATCH &&
- CFLAGS="$CFLAGS -march=k6-3"
- fi &&
- disable_pic
-fi &&
+ # -march=prescott was added after
+ if [[ "$CFLAGS" =~ -march=prescott ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
pentium-mmx.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=pentium-mmx"
+ fi &&
+ if [[ "$CFLAGS" =~ -march=athlon[^[:space:]]* ]]; then
+ message "${MESSAGE_COLOR}Reducing your $BASH_REMATCH to
k6-3.${DEFAULT_COLOR}" &&
+ list_remove CFLAGS $BASH_REMATCH &&
+ CFLAGS="$CFLAGS -march=k6-3"
+ fi &&
+ disable_pic
+ fi
+ fi
+fi &&

-./configure --prefix="$INSTALL_ROOT/usr" \
- --target-list="$QEMU_ARCHS" \
- $OPTS &&
+cd "${SOURCE_DIRECTORY}" &&
+
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --target-list="$QEMU_ARCHS" \
+ --audio-drv-list="$QEMU_AUDIO" \
+ --audio-card-list="$QEMU_CARDS" \
+ $QEMU_KVM \
+ $OPTS &&

make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 1f14d85..6121df0 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,13 +1,12 @@
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
+ BACKTITLE="Qemu Archs Configuration" &&
+ TITLE="Arch Selection" &&
+ HELP="Select Arch you want to build qemu" &&
+
QEMU_ARCHS=`dialog --backtitle "$BACKTITLE" \
--title "$TITLE" \
--stdout \
@@ -19,3 +18,14 @@ fi &&
if [[ -z $QEMU_ARCHS ]]; then
QEMU_ARCHS=$(cut -f 1 $SPELL_DIRECTORY/archs | sed -e 's/^/"/' -e
's/\s*$/"/' | tr '\n' ' ')
fi
+
+. $GRIMOIRE/config_query_multi.function &&
+
+config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
+ oss alsa sdl esd pa fmod &&
+
+config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
+ ac97 es1370 sb16 cs4231a adlib gus &&
+
+config_query_option QEMU_KVM "Enable KVM acceleration support" y \
+ "" "--disable-kvm"
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 17fd5d8..c8a41be 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -1,11 +1,105 @@
-optional_depends sdl \
- "" "--disable-gfx-check" \
- "for graphical output (recommended)" &&
+case $QEMU_VER in
+ 0.10.6)
+ optional_depends sdl \
+ "" \
+ "--disable-gfx-check" \
+ "for graphical output (recommended)" &&

-optional_depends BLUEZ \
- "" "--disable-bluez" \
- "for Bluetooth support" &&
+ optional_depends kqemu \
+ "" \
+ "--disable-kqemu" \
+ "for kernel acceleration support" &&

-optional_depends kqemu \
- "" "--disable-kqemu" \
- "for kernel acceleration support"
+ optional_depends BLUEZ \
+ "" \
+ "--disable-bluez" \
+ "for Bluetooth support" &&
+
+ optional_depends ncurses \
+ "" \
+ "--disable-curses" \
+ "for curses output" &&
+
+ suggest_depends gnutls \
+ "" \
+ "--disable-vnc-tls" \
+ "to enable TLS encryption for VNC server"
+ ;;
+ 0.11.1)
+ optional_depends sdl \
+ "" \
+ "--disable-sdl" \
+ "for graphical output (recommended)" &&
+
+ optional_depends kqemu \
+ "" \
+ "--disable-kqemu" \
+ "for kernel acceleration support" &&
+
+ optional_depends curl \
+ "" \
+ "--disable-curl" \
+ "for curl connectivity support" &&
+
+ optional_depends BLUEZ \
+ "" \
+ "--disable-bluez" \
+ "for Bluetooth support" &&
+
+ optional_depends ncurses \
+ "" \
+ "--disable-curses" \
+ "for curses output" &&
+
+ suggest_depends gnutls \
+ "" \
+ "--disable-vnc-tls" \
+ "to enable TLS encryption for VNC server" &&
+
+ suggest_depends LIBSASL \
+ "" \
+ "--disable-vnc-sasl" \
+ "to enable SASL encryption for VNC server"
+ ;;
+ 0.12.2)
+ optional_depends sdl \
+ "--enable-sdl" \
+ "--disable-sdl" \
+ "for graphical output (recommended)" &&
+
+ optional_depends curl \
+ "--enable-curl" \
+ "--disable-curl" \
+ "for curl connectivity support" &&
+
+ optional_depends BLUEZ \
+ "--enable-bluez" \
+ "--disable-bluez" \
+ "for Bluetooth support" &&
+
+ optional_depends ncurses \
+ "--enable-curses" \
+ "--disable-curses" \
+ "for curses output" &&
+
+ suggest_depends gnutls \
+ "--enable-vnc-tls" \
+ "--disable-vnc-tls" \
+ "to enable TLS encryption for VNC server" &&
+
+ suggest_depends LIBSASL \
+ "--enable-vnc-sasl" \
+ "--disable-vnc-sasl" \
+ "to enable SASL encryption for VNC server"
+ ;;
+esac &&
+
+ suggest_depends bridge-utils \
+ '' \
+ '' \
+ "for creating TUN/TAP bridges" &&
+
+ suggest_depends iproute2 \
+ "" \
+ "" \
+ "for routing between TUN/TAP interfaces"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 5a5f67a..bfa8e02 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,14 +1,31 @@
SPELL=qemu
+
+case $QEMU_VER in
+ 0.10.6)
VERSION=0.10.6
+ ;;
+ 0.11.1)
+ VERSION=0.11.1
+ ;;
+ 0.12.2)
+ VERSION=0.12.2
+ ;;
+esac
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://savannah.inetbridge.net/$SPELL/$SOURCE
- SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE_URL[1]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+
+if [[ $QEMU_VER == "0.10.6" ]]; then
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
- SOURCE_GPG=qemu.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
+else
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+fi
+
DISTCC_HOSTS=
LICENSE[0]=GPL
LICENSE[1]=LGPL
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index ef30e88..1d85989 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,11 @@
+2010-01-20 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS, DEPENDS, PREPARE: added versions 0.11.1 and 0.12.2
+ * BUILD: the build fails only when kqemu support is enabled
+ * CONFIGURE: added queries for supported audio systems
+ and emulated audio cards, added option for KVM support
+ * DEPENDS: added options for ncurses, gnutls, curl, LIBSASL,
+ bridge-utils, iproute2
+
2009-08-15 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS: use BLUEZ provider

diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
new file mode 100755
index 0000000..150110d
--- /dev/null
+++ b/utils/qemu/PREPARE
@@ -0,0 +1,2 @@
+config_query_list QEMU_VER "Which version would you like to build?" \
+ 0.10.6 0.11.1 0.12.2
diff --git a/utils/qemu/qemu-0.11.1.tar.gz.sig
b/utils/qemu/qemu-0.11.1.tar.gz.sig
new file mode 100644
index 0000000..c5e7abd
Binary files /dev/null and b/utils/qemu/qemu-0.11.1.tar.gz.sig differ
diff --git a/utils/qemu/qemu-0.12.2.tar.gz.sig
b/utils/qemu/qemu-0.12.2.tar.gz.sig
new file mode 100644
index 0000000..b55f15d
Binary files /dev/null and b/utils/qemu/qemu-0.12.2.tar.gz.sig differ




Archive powered by MHonArc 2.6.24.

Top of Page