[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d4e1e9ba30dc534e050445a4cabb59d53b14a09e)

Vlad Glagolev scm at sourcemage.org
Thu Aug 11 04:47:02 EDT 2011


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

 dev/null                          |binary
 utils/qemu/BUILD                  |   37 ---------------------
 utils/qemu/CONFIGURE              |   10 +++--
 utils/qemu/DEPENDS                |   64 --------------------------------------
 utils/qemu/DETAILS                |   28 ++++++----------
 utils/qemu/HISTORY                |    9 +++++
 utils/qemu/PREPARE                |    4 +-
 utils/qemu/qemu-0.11.1.tar.gz.sig |    0 
 utils/qemu/qemu-0.12.5.tar.gz.sig |    0 
 9 files changed, 30 insertions(+), 122 deletions(-)

New commits:
commit d4e1e9ba30dc534e050445a4cabb59d53b14a09e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    qemu: => 0.15.0

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index dd22723..0962926 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -1,39 +1,4 @@
-message "Target list: $QEMU_ARCHS"          &&
-
-if [[ $QEMU_VER == "0.10" ]] || [[ $QEMU_VER == "0.11" ]]; 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
-  fi
-fi                                          &&
+message "${MESSAGE_COLOR}Target list: $QEMU_ARCHS${DEFAULT_COLOR}" &&
 
 cd "${SOURCE_DIRECTORY}"                    &&
 
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 5c70f6f..092b75f 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/archs` &&
 persistent_add QEMU_ARCHS &&
 
@@ -24,13 +26,13 @@ fi
 config_query_multi QEMU_AUDIO "Select sound system(s) to support"    \
      oss alsa sdl esd pa fmod                                        &&
 
-if [[ $QEMU_VER == "0.14" ]]; then
+if is_version_less $QEMU_VER 0.14; then
     config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
-         hda ac97 es1370 sb16 cs4231a adlib gus
+                                  ac97 es1370 sb16 cs4231a adlib gus
 else
     config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
-         ac97 es1370 sb16 cs4231a adlib gus
+                                  hda ac97 es1370 sb16 cs4231a adlib gus
 fi &&
 
 config_query_option QEMU_KVM "Enable KVM acceleration support" y     \
-                    "" "--disable-kvm"
+                             "" "--disable-kvm"
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 9008247..78f182a 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -15,69 +15,7 @@ if list_find "esd" $QEMU_AUDIO; then
 fi &&
 
 case $QEMU_VER in
-  0.10)
-           optional_depends sdl                                   \
-                            ""                                    \
-                            "--disable-gfx-check"                 \
-                             "for graphical output (recommended)" &&
-
-           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)
-           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)
+  0.12|*)
            optional_depends sdl                                   \
                             "--enable-sdl"                        \
                             "--disable-sdl"                       \
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 333b694..76eebc8 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,16 +1,10 @@
            SPELL=qemu
 
 if [[ -z $QEMU_VER ]]; then
-  QEMU_VER="0.14"
+  QEMU_VER="0.15"
 fi
 
 case ${QEMU_VER:0:4} in
-  0.10)
-         VERSION=0.10.6
-  ;;
-  0.11)
-         VERSION=0.11.1
-  ;;
   0.12)
          VERSION=0.12.5
   ;;
@@ -20,26 +14,26 @@ case ${QEMU_VER:0:4} in
   0.14)
          VERSION=0.14.1
   ;;
+  0.15)
+         VERSION=0.15.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" ]] || [[ $QEMU_VER == "0.14" ]]; then
+if [[ $QEMU_VER == "0.12" ]] || [[ $QEMU_VER == "0.14" ]]; then
+   SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
+else
+   SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
+fi
          SOURCE2=$SOURCE.sig
   SOURCE2_URL[0]=$SOURCE_URL.sig
-  SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
       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
-      PATCHLEVEL=1
-        WEB_SITE=http://www.nongnu.org/qemu/
+        WEB_SITE=http://qemu.org/
         KEYWORDS="emulator utils"
          ENTERED=20051102
            SHORT="generic and open source processor emulator"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 5db6313..566d435 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,12 @@
+2011-08-11 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: added 0.15 branch; dropped 0.10 and 0.11 support as per
+	  offsite; corrected mirrors for different branches; use only upstream
+	  gpg keycheck
+	* BUILD: removed deprecated limitations
+	* DEPENDS: keep case selector from 0.12 up to the latest branch
+	* PREPARE: made 0.15 default
+	* CONFIGURE: corrected sound card selection per branch
+
 2011-07-28 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.14.1
 
diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index 1ad3020..cbd6b4c 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,6 +1,6 @@
 if [[ ${#QEMU_VER} -eq 6 ]]; then
-	QEMU_VER=${QEMU_VER:0:4}
+  QEMU_VER=${QEMU_VER:0:4}
 fi
 
 config_query_list QEMU_VER "Which branch to build?" \
-                  0.14 0.13 0.12 0.11 0.10
+                           0.15 0.14 0.13 0.12
diff --git a/utils/qemu/qemu-0.11.1.tar.gz.sig b/utils/qemu/qemu-0.11.1.tar.gz.sig
deleted file mode 100644
index c5e7abd..0000000
Binary files a/utils/qemu/qemu-0.11.1.tar.gz.sig and /dev/null differ
diff --git a/utils/qemu/qemu-0.12.5.tar.gz.sig b/utils/qemu/qemu-0.12.5.tar.gz.sig
deleted file mode 100644
index a34dd23..0000000
Binary files a/utils/qemu/qemu-0.12.5.tar.gz.sig and /dev/null differ


More information about the SM-Commit mailing list