Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (966b2542dd4faa3a1db5877de83fd22a3873eb12)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (966b2542dd4faa3a1db5877de83fd22a3873eb12)
  • Date: Wed, 2 Mar 2011 03:56:00 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

utils/qemu/CONFIGURE | 9 +++++++--
utils/qemu/DETAILS | 7 +++++--
utils/qemu/HISTORY | 4 ++++
utils/qemu/PREPARE | 2 +-
4 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 966b2542dd4faa3a1db5877de83fd22a3873eb12
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

qemu: added 0.14 branch, now used if nothing else is selected
added hda audio device for this branch

diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 6121df0..5c70f6f 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -24,8 +24,13 @@ fi
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 &&
+if [[ $QEMU_VER == "0.14" ]]; then
+ config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
+ hda ac97 es1370 sb16 cs4231a adlib gus
+else
+ config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
+ ac97 es1370 sb16 cs4231a adlib gus
+fi &&

config_query_option QEMU_KVM "Enable KVM acceleration support" y \
"" "--disable-kvm"
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 86f4166..a77d878 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,7 +1,7 @@
SPELL=qemu

if [[ -z $QEMU_VER ]]; then
- QEMU_VER="0.12"
+ QEMU_VER="0.14"
fi

case ${QEMU_VER:0:4} in
@@ -17,12 +17,15 @@ case ${QEMU_VER:0:4} in
0.13)
VERSION=0.13.0
;;
+ 0.14)
+ VERSION=0.14.0
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://mirror.its.uidaho.edu/pub/savannah/$SPELL/$SOURCE

-if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.13" ]]; then
+if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.13" ]] || [[ $QEMU_VER ==
"0.14" ]]; then
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 10de120..5a99954 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,7 @@
+2011-03-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PREPARE, DETAILS: added 0.14 branch, now used if nothing else is
selected
+ * CONFIGURE: added hda audio device for 0.14 branch
+
2011-01-19 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* INSTALL: Install /usr/bin/qemu-kvm to allow virt-manager (and other
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index cab7c52..1ad3020 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -3,4 +3,4 @@ if [[ ${#QEMU_VER} -eq 6 ]]; then
fi

config_query_list QEMU_VER "Which branch to build?" \
- 0.13 0.12 0.11 0.10
+ 0.14 0.13 0.12 0.11 0.10



  • [SM-Commit] GIT changes to master grimoire by Julien ROZO (966b2542dd4faa3a1db5877de83fd22a3873eb12), Julien ROZO, 03/02/2011

Archive powered by MHonArc 2.6.24.

Top of Page