Skip to contentSkip to conversation

qemu: Upgrade to 2.7.1

PATCH Superseded Aníbal Limón 4 participants 5 messages Jan 20, 2017 – Jan 23, 2017

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 qemu: Upgrade to 2.7.1

Minor upgrade contains fixes from 2.7.0.

Removed patches (already in upstream):

- 0001-pci-assign-sync-MSI-MSI-X-cap-and-table-with-PCIDevi.patch
- 0001-virtio-zero-vq-inuse-in-virtio_reset.patch
- 0002-fix-CVE-2016-7423.patch

---
 meta/recipes-devtools/qemu/qemu.inc                |  6 +-
 ...sync-MSI-MSI-X-cap-and-table-with-PCIDevi.patch | 71 ----------------------
 ...0001-virtio-zero-vq-inuse-in-virtio_reset.patch | 57 -----------------
 .../qemu/qemu/0002-fix-CVE-2016-7423.patch         | 45 --------------
 .../qemu/{qemu_2.7.0.bb => qemu_2.7.1.bb}          |  7 ---
 5 files changed, 4 insertions(+), 182 deletions(-)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-pci-assign-sync-MSI-MSI-X-cap-and-table-with-PCIDevi.patch
 delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-virtio-zero-vq-inuse-in-virtio_reset.patch
 delete mode 100644 meta/recipes-devtools/qemu/qemu/0002-fix-CVE-2016-7423.patch
 rename meta/recipes-devtools/qemu/{qemu_2.7.0.bb => qemu_2.7.1.bb} (66%)
meta/recipes-devtools/qemu/qemu.inc +4 -2
index b46e7f7..0d91fde 100644
@@ -9,12 +9,11 @@ require qemu-targets.inc
 inherit autotools ptest
 BBCLASSEXTEND = "native nativesdk"
 
-PR = "r1"
-
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
 
 SRC_URI = "\
+    http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
     file://powerpc_rom.bin \
     file://disable-grabs.patch \
     file://exclude-some-arm-EABI-obsolete-syscalls.patch \
@@ -24,6 +23,9 @@ SRC_URI = "\
     file://0001-target-mips-add-24KEc-CPU-definition.patch \
     "
 
+SRC_URI[md5sum] = "a315bc51ed443a08d2cf1416d76b9ab4"
+SRC_URI[sha256sum] = "68636788eb69bcb0b44ba220b32b50495d6bd5712a934c282217831c4822958f"
+
 SRC_URI_append_class-native = "\
     file://fix-libcap-header-issue-on-some-distro.patch \
     file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
meta/recipes-devtools/qemu/qemu/0001-pci-assign-sync-MSI-MSI-X-cap-and-table-with-PCIDevi.patch deleted +0 -71

71 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/0001-virtio-zero-vq-inuse-in-virtio_reset.patch deleted +0 -57

57 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu/0002-fix-CVE-2016-7423.patch deleted +0 -45

45 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu_2.7.1.bb renamed from meta/recipes-devtools/qemu/qemu_2.7.0.bb +0 -7
similarity index 66%
rename from meta/recipes-devtools/qemu/qemu_2.7.0.bb
rename to meta/recipes-devtools/qemu/qemu_2.7.1.bb
index 0d680a7..387eee1 100644
@@ -9,17 +9,10 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
             file://no-valgrind.patch \
             file://pathlimit.patch \
             file://qemu-2.5.0-cflags.patch \
-            file://0001-virtio-zero-vq-inuse-in-virtio_reset.patch \
-            file://0002-fix-CVE-2016-7423.patch \
             file://0003-fix-CVE-2016-7908.patch \
             file://0004-fix-CVE-2016-7909.patch \
-            file://0001-pci-assign-sync-MSI-MSI-X-cap-and-table-with-PCIDevi.patch \
 "
 
-SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
-SRC_URI[md5sum] = "08d4d06d1cb598efecd796137f4844ab"
-SRC_URI[sha256sum] = "326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53"
-
 COMPATIBLE_HOST_mipsarchn32 = "null"
 COMPATIBLE_HOST_mipsarchn64 = "null"
 
Signature · 1 line
2.1.4
#1 lore raw
Quoted 23 lines · Aníbal Limón
meta/recipes-devtools/qemu/qemu.inc +0 -2
@@ -9,12 +9,11 @@ require qemu-targets.inc
 inherit autotools ptest
 BBCLASSEXTEND = "native nativesdk"
 
-PR = "r1"
-
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4

x86_64"

SRC_URI = "\

meta/recipes-devtools/qemu/qemu.inc +3 -0
+    http://wiki.qemu-project.org/download/${BP}.tar.bz2 \
     file://powerpc_rom.bin \
     file://disable-grabs.patch \
     file://exclude-some-arm-EABI-obsolete-syscalls.patch \
@@ -24,6 +23,9 @@ SRC_URI = "\
     file://0001-target-mips-add-24KEc-CPU-definition.patch \
     "
 
+SRC_URI[md5sum] = "a315bc51ed443a08d2cf1416d76b9ab4"
+SRC_URI[sha256sum] =
Quoted 1 line

"68636788eb69bcb0b44ba220b32b50495d6bd5712a934c282217831c4822958f"

Slight misunderstanding, I suppose. The *URL* is independent of the version and could be added in qemu.inc, but the hashes are version dependent and are better suited for qemu_2.7.1.bb. At least that's how I would do it.

In contrast to Alexander, I would also keep
http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb with SRC_URI =+ because then there can be a qemu_git.bb with a different URL than the one above.

Signature · 6 lines
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
#2 lore raw
Quoted 4 lines · Patrick Ohly

In contrast to Alexander, I would also keep
http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb with SRC_URI =+ because then there can be a qemu_git.bb with a different URL than the one above.

I would discourage creation of such separate _git recipes, unless there is a clear benefit to the whole of oe-core. They are almost always untested and neglected, and eventually removed because they're outdated and broken and no one cares.

Alex

#3 lore raw
Quoted 11 lines · Alexander Kanavin
Quoted 4 lines · Patrick Ohly

In contrast to Alexander, I would also keep
http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb with SRC_URI =+ because then there can be a qemu_git.bb with a different URL than the one above.

I would discourage creation of such separate _git recipes, unless there is a clear benefit to the whole of oe-core. They are almost always untested and neglected, and eventually removed because they're outdated and broken and no one cares.

I wasn't suggesting to add one, just using the possibility that one might want to add one as the rationale for keeping the download URL for the tarball out of the .inc file.

It's all rather subjective and hinges on the likelihood of adding a _git.bb (don't include it in the .inc) vs. adding more than one versioned .bb (then including the common download in the .inc reduces duplication).

Signature · 6 lines
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
#4 lore raw
Quoted 22 lines · Patrick Ohly
Quoted 10 lines · Alexander Kanavin
Quoted 7 lines · Patrick Ohly

In contrast to Alexander, I would also keep
http://wiki.qemu-project.org/download/${BP}.tar.bz2 in qemu_2.7.1.bb
with SRC_URI =+ because then there can be a qemu_git.bb with a different
URL than the one above.

Quoted 6 lines

I would discourage creation of such separate _git recipes, unless there
is a clear benefit to the whole of oe-core. They are almost always untested and neglected, and eventually removed because they're outdated
and broken and no one cares.

I wasn't suggesting to add one, just using the possibility that one might want to add one as the rationale for keeping the download URL for
the tarball out of the .inc file.

Quoted 4 lines

It's all rather subjective and hinges on the likelihood of adding a _git.bb (don't include it in the .inc) vs. adding more than one versioned .bb (then including the common download in the .inc reduces duplication).

There is actually an alternative proposal somewhere in bugzilla which would be to leave enough markup that we can easily enable a git version. That markup mostly being the git:// url in a variable. Ross was looking at that.

Cheers,

Richard