sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (859a05ccca387937b5fed94f8726f8bc4ad61017)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (859a05ccca387937b5fed94f8726f8bc4ad61017)
- Date: Thu, 30 May 2019 21:42:35 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
utils/qemu/BUILD | 4 -
utils/qemu/CONFIGURE | 17 +++--
utils/qemu/DEPENDS | 42 +++++-------
utils/qemu/DETAILS | 3
utils/qemu/HISTORY | 7 ++
utils/qemu/INSTALL | 6 +
utils/qemu/archs | 111
+++++++++++++++++++--------------
utils/qemu/patches/10-glibc-2.27.patch | 57 ----------------
8 files changed, 110 insertions(+), 137 deletions(-)
New commits:
commit 859a05ccca387937b5fed94f8726f8bc4ad61017
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
qemu 4.0.0
diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 875f0ca..6ecca90 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -12,9 +12,7 @@ fi &&
--target-list="$QEMU_ARCHS" \
--audio-drv-list="$QEMU_AUDIO" \
--python=python2 \
- $QEMU_KVM \
- $QEMU_VNC \
- $QEMU_TPM \
+ $QEMU_OPTS \
$OPTS &&
# Pass down ARFLAGS to workaround a bug in QEMU's build system
diff --git a/utils/qemu/CONFIGURE b/utils/qemu/CONFIGURE
index 628ab77..2d13d07 100755
--- a/utils/qemu/CONFIGURE
+++ b/utils/qemu/CONFIGURE
@@ -31,15 +31,20 @@ config_query_multi QEMU_AUDIO "Select sound system(s) to
support" \
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" &&
+config_query_option QEMU_OPTS "Enable KVM acceleration support" y \
+ "" "--disable-kvm" &&
-config_query_option QEMU_TPM "Enable Trusted Platform Module (TPM)?" n \
- '--enable-tpm' '' &&
+config_query_option QEMU_OPTS "Enable Trusted Platform Module (TPM)?" n \
+ '--enable-tpm' '' &&
-config_query_option QEMU_VNC "Enable VNC support?" y \
+config_query_option QEMU_OPTS "Enable VNC support?" y \
'--enable-vnc' \
'--disable-vnc --disable-vnc-sasl --disable-vnc-jpeg
--disable-vnc-png' &&
-config_query_multi QEMU_VNC_TLS "Enable TLS encryption in VNC?" 'none'
'nettle' 'gcrypt'
+config_query_multi QEMU_VNC_TLS "Enable TLS encryption in VNC?" 'none'
'nettle' 'gcrypt' &&
+
+config_query_option QEMU_OPTS \
+ 'Build documentation? (requires: perl, python, texinfo)' y \
+ '--enable-docs' \
+ '--disable-docs'
diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index 24db2c1..0d11003 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -5,7 +5,7 @@ if list_find "alsa" $QEMU_AUDIO; then
fi &&
if list_find "sdl" $QEMU_AUDIO; then
- depends sdl
+ depends sdl2
fi &&
if list_find "pa" $QEMU_AUDIO; then
@@ -16,6 +16,14 @@ if list_find "esd" $QEMU_AUDIO; then
depends esound
fi &&
+case "$QEMU_OPTS" in *--enable-docs*)
+ depends texinfo &&
+ depends python-sphinx &&
+ depends perl &&
+ depends podlators
+esac &&
+
+
optional_depends gtk+3 \
'--enable-gtk --with-gtkabi=3.0' \
'' \
@@ -35,15 +43,9 @@ else
fi
optional_depends sdl2 \
- '--enable-sdl --with-sdlabi=2.0' \
- '' \
+ '--enable-sdl' \
+ '--disable-sdl' \
'for SDL 2.x UI (recommended)' &&
-if ! is_depends_enabled $SPELL sdl2; then
- optional_depends sdl \
- "--enable-sdl --with-sdlabi=1.2" \
- "--disable-sdl" \
- "for SDL 1.2 UI (recommended)"
-fi &&
optional_depends ncurses \
"--enable-curses" \
@@ -70,11 +72,6 @@ optional_depends libcap-ng \
'--disable-cap-ng' \
'for expanded Linux POSIX API capabilities' &&
-optional_depends texinfo \
- '--enable-docs' \
- '--disable-docs' \
- 'to build documentation' &&
-
optional_depends libaio \
'--enable-linux-aio' \
'--disable-linux-aio' \
@@ -110,18 +107,18 @@ optional_depends bzip2 \
'--disable-bzip2' \
'for reading bzip2-compressed dmg images' &&
-if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
+case "$QEMU_OPTS" in *--enable-vnc*)
suggest_depends gnutls \
"--enable-gnutls" \
"--disable-gnutls" \
"to enable TLS encryption for VNC server" &&
- if [[ "x${QEMU_VNC_TLS}" == "xnettle" ]]; then
- depends nettle '--enable-nettle --disable-gcrypt'
- elif [[ "x${QEMU_VNC_TLS}" == "xgcrypt" ]]; then
- depends libgcrypt '--enable-gcrypt --disable-nettle'
- fi &&
-
+ case "$QEMU_VNC_TLS" in
+ nettle)
+ depends nettle '--enable-nettle --disable-gcrypt' ;;
+ gcrypt)
+ depends libgcrypt '--enable-gcrypt --disable-nettle' ;;
+ esac
suggest_depends LIBSASL \
"--enable-vnc-sasl" \
"--disable-vnc-sasl" \
@@ -136,7 +133,8 @@ if [[ "x$QEMU_VNC" == "x--enable-vnc" ]]; then
'--enable-vnc-png' \
'--disable-vnc-png' \
'for PNG compression for VNC server'
-fi &&
+ ;;
+esac &&
suggest_depends bridge-utils \
'' \
diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index c7a01ec..4a03ffc 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,5 +1,5 @@
SPELL=qemu
- VERSION=2.11.1
+ VERSION=4.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
@@ -13,7 +13,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
WEB_SITE=http://qemu.org/
KEYWORDS="emulator utils"
ENTERED=20051102
- PATCHLEVEL=1
SECURITY_PATCH=1
SHORT="generic and open source processor emulator"
cat << EOF
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 59e1643..f187dbc 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,10 @@
+2019-05-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.0.0
+ * DEPENDS: removed SDL 1.x, not supported anymore
+ * patches/10-glibc-2.27.patch: removed, no longer needed
+ * BUILD, CONFIGURE, DEPENDS, INSTALL: Streamlined options
+ * archs: Updated supported targets
+
2018-03-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to latest stable 2.11.1
* patches/10-glibc-2.27.patch: Fix compilation against glibc 2.27
diff --git a/utils/qemu/INSTALL b/utils/qemu/INSTALL
index d106705..a26ee9f 100755
--- a/utils/qemu/INSTALL
+++ b/utils/qemu/INSTALL
@@ -1,6 +1,8 @@
default_install &&
-if [[ "${QEMU_KVM}" != "--disable-kvm" ]]; then
+case "$QEMU_OPTS" in
+*--disable-kvm*) ;;
+*)
ARCH=$(uname -m)
if [[ "${ARCH}" == "i686" ]]; then
@@ -18,4 +20,4 @@ if [[ "${QEMU_KVM}" != "--disable-kvm" ]]; then
ln -sf /usr/bin/qemu-system-${ARCH} \
"${INSTALL_ROOT}"/usr/bin/qemu-kvm
-fi
+esac
diff --git a/utils/qemu/archs b/utils/qemu/archs
index d181f2c..5db6b88 100644
--- a/utils/qemu/archs
+++ b/utils/qemu/archs
@@ -1,45 +1,66 @@
-alpha-linux-user alpha 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
-x86_64-linux-user x86_64 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
-mips64-softmmu mips64-softmmu on
-mips64el-softmmu mips64el-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
-x86_64-softmmu x86_64-softmmu on
-xtensa-softmmu xtensa-softmmu on
-xtensaeb-softmmu xtensaeb-softmmu on
+aarch64-linux-user aarch64-user on
+aarch64-softmmu aarch64 on
+aarch64_be-linux-user aarch64_be-user on
+alpha-linux-user alpha-user on
+alpha-softmmu alpha on
+arm-linux-user arm-user on
+arm-softmmu arm on
+armeb-linux-user armeb-user on
+cris-linux-user cris-user on
+cris-softmmu cris on
+hppa-linux-user hppa-user on
+hppa-softmmu hppa on
+i386-linux-user i386-user on
+i386-softmmu i386 on
+lm32-softmmu lm32 on
+m68k-linux-user m68k-user on
+m68k-softmmu m68k on
+microblaze-linux-user microblaze-user on
+microblaze-softmmu microblaze on
+microblazeel-linux-user microblazeel-user on
+microblazeel-softmmu microblazeel on
+mips-linux-user mips-user on
+mips-softmmu mips on
+mips64-linux-user mips64-user on
+mips64-softmmu mips64 on
+mips64el-linux-user mips64el-user on
+mips64el-softmmu mips64el on
+mipsel-linux-user mipsel-user on
+mipsel-softmmu mipsel on
+mipsn32-linux-user mipsn32-user on
+mipsn32el-linux-user mipsn32el-user on
+moxie-softmmu moxie on
+nios2-linux-user nios2-user on
+nios2-softmmu nios2 on
+or1k-linux-user or1k-user on
+or1k-softmmu or1k on
+ppc-linux-user ppc-user on
+ppc-softmmu ppc on
+ppc64-linux-user ppc64-user on
+ppc64-softmmu ppc64 on
+ppc64abi32-linux-user ppc64abi32-user on
+ppc64le-linux-user ppc64le-user on
+riscv32-linux-user riscv32-user on
+riscv32-softmmu riscv32 on
+riscv64-linux-user riscv64-user on
+riscv64-softmmu riscv64 on
+s390x-linux-user s390x-user on
+s390x-softmmu s390x on
+sh4-linux-user sh4-user on
+sh4-softmmu sh4 on
+sh4eb-linux-user sh4eb-user on
+sh4eb-softmmu sh4eb on
+sparc-linux-user sparc-user on
+sparc-softmmu sparc on
+sparc32plus-linux-user sparc32plus-user on
+sparc64-linux-user sparc64-user on
+sparc64-softmmu sparc64 on
+tilegx-linux-user tilegx-user on
+tricore-softmmu tricore on
+unicore32-softmmu unicore32 on
+x86_64-linux-user x86_64-user on
+x86_64-softmmu x86_64 on
+xtensa-linux-user xtensa-user on
+xtensa-softmmu xtensa on
+xtensaeb-linux-user xtensaeb-user on
+xtensaeb-softmmu xtensaeb on
diff --git a/utils/qemu/patches/10-glibc-2.27.patch
b/utils/qemu/patches/10-glibc-2.27.patch
deleted file mode 100644
index b9df6e8..0000000
--- a/utils/qemu/patches/10-glibc-2.27.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-# From
https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0
-# per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891375
-From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini AT redhat.com>
-Date: Tue, 28 Nov 2017 11:51:27 +0100
-Subject: [PATCH] memfd: fix configure test
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Recent glibc added memfd_create in sys/mman.h. This conflicts with
-the definition in util/memfd.c:
-
- /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static
declaration of memfd_create follows non-static declaration
-
-Fix the configure test, and remove the sys/memfd.h inclusion since the
-file actually does not exist---it is a typo in the memfd_create(2) man
-page.
-
-Cc: Marc-André Lureau <marcandre.lureau AT redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini AT redhat.com>
----
- configure | 2 +-
- util/memfd.c | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 9c8aa5a..99ccc17 100755
---- a/configure
-+++ b/configure
-@@ -3923,7 +3923,7 @@ fi
- # check if memfd is supported
- memfd=no
- cat > $TMPC << EOF
--#include <sys/memfd.h>
-+#include <sys/mman.h>
-
- int main(void)
- {
-diff --git a/util/memfd.c b/util/memfd.c
-index 4571d1a..412e94a 100644
---- a/util/memfd.c
-+++ b/util/memfd.c
-@@ -31,9 +31,7 @@
-
- #include "qemu/memfd.h"
-
--#ifdef CONFIG_MEMFD
--#include <sys/memfd.h>
--#elif defined CONFIG_LINUX
-+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
- #include <sys/syscall.h>
- #include <asm/unistd.h>
-
---
-1.8.3.1
-
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (859a05ccca387937b5fed94f8726f8bc4ad61017), Ismael Luceno, 05/30/2019
Archive powered by MHonArc 2.6.24.