Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (2e8120011c407b7b1b459e663dd21fa7fad6dea5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (2e8120011c407b7b1b459e663dd21fa7fad6dea5)
  • Date: Fri, 19 Apr 2013 18:02:58 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

utils/qemu/BUILD | 1
utils/qemu/CONFIGURE | 20 +++------
utils/qemu/DEPENDS | 104
++++++++++++++++++++++++++++--------------------
utils/qemu/DETAILS | 37 +----------------
utils/qemu/HISTORY | 10 ++++
utils/qemu/PREPARE | 7 ---
utils/qemu/PRE_BUILD | 6 --
utils/qemu/archs | 41 ++++++++++++------
utils/qemu/archs-0.15 | 41 ------------------
utils/qemu/cflags.patch | 11 -----
10 files changed, 111 insertions(+), 167 deletions(-)

New commits:
commit 2e8120011c407b7b1b459e663dd21fa7fad6dea5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qemu: Updated to 1.4.1
Removed branches, they no longer (even 1.1) compile without
work.
Query for enabling VNC
Optionally depends on libcap-ng
Move VNC-specific optional dependencies into a VNC enabled
check
Pass $QEMU_VNC to ./configure
PRE_BUILD, cflags.patch, archs-0.15: Removed
Updated architecture list to 1.4.1

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 2689dd5..a4b775a 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -8,6 +8,7 @@ cd "${SOURCE_DIRECTORY}" &&
--audio-drv-list="$QEMU_AUDIO" \
--audio-card-list="$QEMU_CARDS" \
$QEMU_KVM \
+ $QEMU_VNC \
$OPTS &&

make
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index ecf3292..2d81f2e 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -1,10 +1,6 @@
. "$GRIMOIRE/FUNCTIONS" &&

-if is_version_less $QEMU_VER 0.15; then
- local QEMU_ARCH_FILE=archs
-else
- local QEMU_ARCH_FILE=archs-0.15
-fi &&
+local QEMU_ARCH_FILE=archs

local QEMU_ARCH_LIST=`cat $SPELL_DIRECTORY/$QEMU_ARCH_FILE` &&
persistent_add QEMU_ARCHS &&
@@ -32,13 +28,11 @@ fi
config_query_multi QEMU_AUDIO "Select sound system(s) to support" \
oss alsa sdl esd pa fmod &&

-if is_version_less $QEMU_VER 0.14; then
- config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- ac97 es1370 sb16 cs4231a adlib gus
-else
- config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
- hda ac97 es1370 sb16 cs4231a adlib gus
-fi &&
+config_query_multi QEMU_CARDS "Select sound card(s) to emulate" \
+ hda ac97 es1370 sb16 cs4231a adlib gus &&

config_query_option QEMU_KVM "Enable KVM acceleration support" y \
- "" "--disable-kvm"
+ "" "--disable-kvm" &&
+
+config_query_option QEMU_VNC "Enable VNC support?" y \
+ '--enable-vnc' '--disable-vnc --disable-vnc-sasl
--disable-vnc-jpeg --disable-vnc-png --disable-vnc-ws'
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 78f182a..25c938d 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -14,46 +14,64 @@ if list_find "esd" $QEMU_AUDIO; then
depends esound
fi &&

-case $QEMU_VER in
- 0.12|*)
- 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"
+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" &&
+
+optional_depends attr \
+ '--enable-attr' \
+ '--disable-attr' \
+ 'for attr/xattr support in XFS' &&
+
+optional_depends libcap-ng \
+ '--enable-cap-ng' \
+ '--disable-cap-ng' \
+ 'for expanded Linux POSIX API capabilities' &&
+
+if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
+ 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" &&
+
+ suggest_depends JPEG \
+ '--enable-vnc-jpeg' \
+ '--disable-vnc-jpeg' \
+ 'for JPEG lossy compression for VNC server' &&
+
+ suggest_depends libpng \
+ '--enable-vnc-png' \
+ '--disable-vnc-png' \
+ 'for PNG compression for VNC server'
+fi &&
+
+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 6d01434..b2ae39e 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,43 +1,12 @@
SPELL=qemu
-case $QEMU_VER in
- 0.12)
- VERSION=0.12.5
- ;;
- 0.13)
- VERSION=0.13.0
- ;;
- 0.14)
- VERSION=0.14.1
- ;;
- 0.15)
- VERSION=0.15.1
- ;;
- 1.0)
- VERSION=1.0.1
- ;;
- *)
- VERSION=1.1.1-1
- ;;
-esac
-if [ $QEMU_VER = 1.1 ]; then
+ VERSION=1.4.1
SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
-else
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-fi
-case $QEMU_VER in
- 0.12|0.14)
- SOURCE_URL[0]=http://download.savannah.gnu.org/releases/$SPELL/$SOURCE
- ;;
- *)
SOURCE_URL[0]=http://wiki.qemu.org/download/$SOURCE
- ;;
-esac
- SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=$SOURCE_URL.sig
- SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
SOURCE2_IGNORE=signature
+ SOURCE_GPG="qemu.gpg:${SOURCE2}:UPSTREAM_KEY"
DISTCC_HOSTS=
LICENSE[0]=GPL
LICENSE[1]=LGPL
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index d60a43b..e3f503b 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,13 @@
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.4.1
+ Removed branches, they no longer (even 1.1) compile without work.
+ * CONFIGURE: Query for enabling VNC
+ * DEPENDS: Optionally depends on libcap-ng
+ Move VNC-specific optional dependencies into a VNC enabled check
+ * BUILD: Pass $QEMU_VNC to ./configure
+ * PRE_BUILD, cflags.patch, archs-0.15: Removed
+ * archs: Updated to 1.4.1 architecture list
+
2012-08-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.1-1 (branch 1.1); removed tabs

diff --git a/utils/qemu/PREPARE b/utils/qemu/PREPARE
index a322469..f2f6cf3 100755
--- a/utils/qemu/PREPARE
+++ b/utils/qemu/PREPARE
@@ -1,6 +1 @@
-if [[ ${#QEMU_VER} -gt 4 ]]; then
- QEMU_VER=${QEMU_VER%.*}
-fi
-
-config_query_list QEMU_VER "Which branch to build?" \
- 1.1 1.0 0.15 0.14 0.13 0.12
+persistent_remove QEMU_VER
diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
deleted file mode 100755
index 428663f..0000000
--- a/utils/qemu/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ "${QEMU_VER:0:4}" == "0.15" ]]; then
- patch -p0 < "$SPELL_DIRECTORY/cflags.patch"
-fi
diff --git a/utils/qemu/archs b/utils/qemu/archs
index 1b295fe..fbbe31a 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,32 +1,47 @@
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
+i386-linux-user i386 on
m68k-linux-user m68k on
+microblaze-linux-user microblaze on
+microblazeel-linux-user microblazeel on
mips-linux-user mips on
mipsel-linux-user mipsel on
+or32-linux-user or32 on
ppc-linux-user ppc on
ppc64-linux-user ppc64 on
ppc64abi32-linux-user ppc64abi32 on
+s390x-linux-user s390x on
+sh4-linux-user sh4 on
+sh4eb-linux-user sh4eb 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
+unicore32-linux-user unicore32 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
+alpha-softmmu alpha-softmmu on
+arm-softmmu arm-softmmu on
+cris-softmmu cris-softmmu on
+i386-softmmu i386-softmmu on
+lm32-softmmu lm32-softmmu on
+m68k-softmmu m68k-softmmu on
+microblaze-softmmu microblaze-softmmu on
+microblazeel-softmmu microblazeel-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
+mipsel-softmmu mipsel-softmmu on
+or32-softmmu or32-softmmu on
+ppc-softmmu ppc-softmmu on
+ppc64-softmmu ppc64-softmmu on
+ppcemb-softmmu ppcemb-softmmu on
+s390x-softmmu s390x-softmmu on
sh4-softmmu sh4-softmmu on
sh4eb-softmmu sh4eb-softmmu on
+sparc-softmmu sparc-softmmu on
+sparc64-softmmu sparc64-softmmu on
+unicore32-softmmu unicore32-softmmu on
+x86_64-softmmu x86_64-softmmu on
+xtensa-softmmu xtensa-softmmu on
+xtensaeb-softmmu xtensaeb-softmmu on
diff --git a/utils/qemu/archs-0.15 b/utils/qemu/archs-0.15
deleted file mode 100644
index a062278..0000000
--- a/utils/qemu/archs-0.15
+++ /dev/null
@@ -1,41 +0,0 @@
-alpha-linux-user alpha on
-armeb-linux-user armeb on
-arm-linux-user arm on
-cris-linux-user cris on
-i386-linux-user i386 on
-m68k-linux-user m68k on
-microblazeel-linux-user microblazeel on
-microblaze-linux-user microblaze on
-mipsel-linux-user mipsel on
-mips-linux-user mips on
-ppc64abi32-linux-user ppc64abi32 on
-ppc64-linux-user ppc64 on
-ppc-linux-user ppc on
-s390x-linux-user s390x on
-sh4eb-linux-user sh4eb on
-sh4-linux-user sh4 on
-sparc32plus-linux-user sparc32plus on
-sparc64-linux-user sparc64 on
-sparc-linux-user sparc on
-unicore32-linux-user unicore32 on
-x86_64-linux-user x86_64 on
-arm-softmmu arm-softmmu on
-cris-softmmu cris-softmmu on
-i386-softmmu i386-softmmu on
-lm32-softmmu lm32-softmmu on
-m68k-softmmu m68k-softmmu on
-microblazeel-softmmu microblazeel-softmmu on
-microblaze-softmmu microblaze-softmmu on
-mips64el-softmmu mips64el-softmmu on
-mips64-softmmu mips64-softmmu on
-mipsel-softmmu mipsel-softmmu on
-mips-softmmu mips-softmmu on
-ppc64-softmmu ppc64-softmmu on
-ppcemb-softmmu ppcemb-softmmu on
-ppc-softmmu ppc-softmmu on
-s390x-softmmu s390x-softmmu on
-sh4eb-softmmu sh4eb-softmmu on
-sh4-softmmu sh4-softmmu on
-sparc64-softmmu sparc64-softmmu on
-sparc-softmmu sparc-softmmu on
-x86_64-softmmu x86_64-softmmu on
diff --git a/utils/qemu/cflags.patch b/utils/qemu/cflags.patch
deleted file mode 100644
index 58b66e7..0000000
--- a/utils/qemu/cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig 2011-08-17 17:16:32.000000000 +0400
-+++ configure 2011-08-17 17:16:41.785907691 +0400
-@@ -2538,7 +2538,7 @@
- }
- EOF
- if ! compile_prog "" "" ; then
-- CFLAGS+="-march=i486"
-+ CFLAGS+=" -march=i486"
- fi
- fi
-



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (2e8120011c407b7b1b459e663dd21fa7fad6dea5), Eric Sandall, 04/19/2013

Archive powered by MHonArc 2.6.24.

Top of Page