Skip to Content.
Sympa Menu

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

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 (f3e65bf8c3de22b7468e6f2f32d7bd75cf2cad80)
  • Date: Fri, 9 Mar 2018 21:48:39 +0000

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

utils/qemu/DETAILS | 2 -
utils/qemu/HISTORY | 7 ++++
utils/qemu/PRE_BUILD | 4 +-
utils/qemu/patches/10-glibc-2.27.patch | 57
+++++++++++++++++++++++++++++++++
4 files changed, 68 insertions(+), 2 deletions(-)

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

qemu: Updated to latest stable 2.11.1

patches/10-glibc-2.27.patch: Fix compilation against glibc 2.27
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891375
Also affects qemu 2.10.x

diff --git a/utils/qemu/DETAILS b/utils/qemu/DETAILS
index 338db9e..c7a01ec 100755
--- a/utils/qemu/DETAILS
+++ b/utils/qemu/DETAILS
@@ -1,5 +1,5 @@
SPELL=qemu
- VERSION=2.10.0
+ VERSION=2.11.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index 3b53c64..59e1643 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,10 @@
+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
+ See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891375
+ Also affects qemu 2.10.x
+ * PRE_BUILD: Apply patches directory
+
2017-09-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.10.0

diff --git a/utils/qemu/PRE_BUILD b/utils/qemu/PRE_BUILD
index 55eb1fc..bb85363 100755
--- a/utils/qemu/PRE_BUILD
+++ b/utils/qemu/PRE_BUILD
@@ -28,5 +28,7 @@ fi &&

if ! list_find "${QEMU_CARDS}" "sb16"; then
sedit 's:CONFIG_SB16=y:CONFIG_SB16=n:'
"${SOURCE_DIRECTORY}"/default-configs/sound.mak
-fi
+fi &&

+cd "${SOURCE_DIRECTORY}" &&
+apply_patch_dir patches
diff --git a/utils/qemu/patches/10-glibc-2.27.patch
b/utils/qemu/patches/10-glibc-2.27.patch
new file mode 100644
index 0000000..b9df6e8
--- /dev/null
+++ b/utils/qemu/patches/10-glibc-2.27.patch
@@ -0,0 +1,57 @@
+# 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 Eric Sandall (f3e65bf8c3de22b7468e6f2f32d7bd75cf2cad80), Eric Sandall, 03/09/2018

Archive powered by MHonArc 2.6.24.

Top of Page