diff --git a/obs-packaging/gen_versions_txt.sh b/obs-packaging/gen_versions_txt.sh index 27aee7ee41..167bb077de 100755 --- a/obs-packaging/gen_versions_txt.sh +++ b/obs-packaging/gen_versions_txt.sh @@ -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} diff --git a/obs-packaging/qemu-vanilla/_service-template b/obs-packaging/qemu-vanilla/_service-template index f339e0b28b..d2547c0a47 100644 --- a/obs-packaging/qemu-vanilla/_service-template +++ b/obs-packaging/qemu-vanilla/_service-template @@ -2,7 +2,7 @@ git - https://github.com/kata-containers/qemu.git + https://github.com/qemu/qemu.git .git qemu-vanilla diff --git a/obs-packaging/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch b/obs-packaging/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch deleted file mode 100644 index b1f354ac1c..0000000000 --- a/obs-packaging/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 -From: Paolo Bonzini -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 -Signed-off-by: Paolo Bonzini ---- - 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 -+#include - - 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 --#elif defined CONFIG_LINUX -+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD - #include - #include - --- -1.8.3.1 - diff --git a/obs-packaging/versions.txt b/obs-packaging/versions.txt index 2a7f78847c..59d7661442 100644 --- a/obs-packaging/versions.txt +++ b/obs-packaging/versions.txt @@ -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