github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 09:13:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from jcvenegas/fix-qemu-vanilla-rng

Browse Source 
obs: qemu-vanilla: point to qemu repository.
This commit is contained in:
Julio Montes 2018-08-29 13:17:36 -05:00 committed by GitHub
commit c2c7c1c513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obs-packaging/gen_versions_txt.sh
View File

@ -73,7 +73,7 @@ qemu_lite_version=${qemu_lite_version}
qemu_lite_hash=${qemu_lite_hash}
qemu_vanilla_version=${qemu_vanilla_version}
qemu_vanilla_hash=${qemu_lite_hash}
qemu_vanilla_hash=${qemu_vanilla_hash}
kernel_version=${kernel_version}

2
obs-packaging/qemu-vanilla/_service-template
View File

@ -2,7 +2,7 @@
<services>
<service name="tar_scm">
<param name="scm">git</param>
<param name="url">https://github.com/kata-containers/qemu.git</param>
<param name="url">https://github.com/qemu/qemu.git</param>
<param name="exclude">.git</param>
<param name="filename">qemu-vanilla</param>
<!--- %h in the version format is a hash from a given revision -->

55
obs-packaging/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch
View File

@ -1,55 +0,0 @@
From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@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@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 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

2
obs-packaging/versions.txt
View File

@ -23,7 +23,7 @@ qemu_lite_version=2.11.0
qemu_lite_hash=a39e0b3e828ff6fb4457865ef7a021f1e7320c27
qemu_vanilla_version=2.11.2
qemu_vanilla_hash=a39e0b3e828ff6fb4457865ef7a021f1e7320c27
qemu_vanilla_hash=0982a56a551556c704dc15752dabf57b4be1c640
kernel_version=4.14.51