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/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