diff options
author | Roland Hieber <r.hieber@pengutronix.de> | 2018-05-31 12:03:34 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2018-06-05 12:52:26 +0200 |
commit | 2314411efd928d44ef9da277b8a97c40645a75df (patch) | |
tree | 5a9a144110dfbbf1fe330919b2b7cbacd63d20bd /patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch | |
parent | 5ff914cc700b2b4c9dd73e34408101794822495c (diff) | |
download | DistroKit-2314411efd928d44ef9da277b8a97c40645a75df.tar.gz DistroKit-2314411efd928d44ef9da277b8a97c40645a75df.tar.xz |
qemu: remove leftover patches
With PTXdist 2018.05, qemu was bumped to version 2.11.1, so those
patches are no longer applied.
- 0001-virtfs-proxy-helper-make-sure-sys-xattr.h-is-include.patch:
unclear if still needed, but qemu now builds fine without it. (Someone
should to check whether we still have an "older glibc".) In any case
this patch should be applied in upstream PTXdist if needed.
- 0002-hw-sd-fix-out-of-bounds-check-for-multi-block-reads.patch:
applied in upstream qemu-2.11, commit 8573378e62d19e25a2434e
- 0003-memfd-fix-configure-test.patch:
applied in upstream ptxdist-2018.04.0, commit 99f897ba09b9d1528a4b
Fixes: 22ae0f6 ("ptxdist: version bump 2018.03.0 -> 2018.05.0")
Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
Diffstat (limited to 'patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch')
-rw-r--r-- | patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch b/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch deleted file mode 100644 index 760bb97..0000000 --- a/patches/qemu-2.10.1/0003-memfd-fix-configure-test.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Paolo Bonzini <pbonzini@redhat.com> -Date: Tue, 28 Nov 2017 10:51:27 +0100 -Subject: [PATCH] memfd: fix configure test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -memfd: fix configure test - -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@redhat.com> -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> ---- - configure | 2 +- - util/memfd.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index dd73cce62f9d..53581d787dac 100755 ---- a/configure -+++ b/configure -@@ -3855,7 +3855,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 4571d1aba866..412e94a405fc 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> - |