diff options
| author | Julien ROZO | 2011-03-02 10:55:07 +0100 |
|---|---|---|
| committer | Julien ROZO | 2011-03-02 10:55:07 +0100 |
| commit | 966b2542dd4faa3a1db5877de83fd22a3873eb12 (patch) | |
| tree | 7e47429871a30093637c7ef194701ea0f2e81877 | |
| parent | c18c9f8412de6e7189f6d693937af71c31a19932 (diff) | |
qemu: added 0.14 branch, now used if nothing else is selected
added hda audio device for this branch
| -rwxr-xr-x | utils/qemu/CONFIGURE | 9 | ||||
| -rwxr-xr-x | utils/qemu/DETAILS | 7 | ||||
| -rw-r--r-- | utils/qemu/HISTORY | 4 | ||||
| -rwxr-xr-x | utils/qemu/PREPARE | 2 |
4 files changed, 17 insertions, 5 deletions
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE index 6121df0d69..5c70f6ff54 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 86f41661fc..a77d878e57 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 10de120f8a..5a99954367 100644 --- a/utils/qemu/HISTORY +++ b/utils/qemu/HISTORY @@ -1,3 +1,7 @@ +2011-03-02 Julien "_kaze_" ROZO <julien@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@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 cab7c52993..1ad3020f34 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 |