Skip to contentSkip to conversation

package/qemu: move patch 3 to the 3.1.1.1 subdir

PATCH New unixmania at gmail.com 3 participants 4 messages Oct 21, 2019 – Oct 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qemu: move patch 3 to the 3.1.1.1 subdir

From: Carlos Santos <[email protected]>

Required since the bump from 3.1.1.

---
Do we really need the subdir? I know that qemu keeps four releases but as far as I know Buildroot always included only one. Are there plans to add a configuration to choose the qemu version?

---
 ...0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/qemu/{3.1.1 => 3.1.1.1}/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch (100%)
package/qemu/3.1.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch renamed from package/qemu/3.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch +0 -0
similarity index 100%
rename from package/qemu/3.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
rename to package/qemu/3.1.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 package/qemu: move patch 3 to the 3.1.1.1 subdir

Hello Carlos,

Quoted 9 lines · On Mon, 21 Oct 2019 09:41:39 -0300 unixmania at gmail.com wrote:

From: Carlos Santos <[email protected]>

Required since the bump from 3.1.1.

---
Do we really need the subdir? I know that qemu keeps four releases but as far as I know Buildroot always included only one. Are there plans to add a configuration to choose the qemu version?

There is already such a version selection:

ifeq ($(BR2_csky),y)
QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) else
QEMU_VERSION = 3.1.1.1
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org
endif

So we want the patches to only apply when the upstream 3.1.1.1 version is used, and not when the C-SKY specific version is used.

Quoted 3 lines
 ...0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/qemu/{3.1.1 => 3.1.1.1}/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch (100%)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/qemu: move patch 3 to the 3.1.1.1 subdir

Quoted 27 lines · Thomas Petazzoni

Hello Carlos,

Quoted 9 lines · On Mon, 21 Oct 2019 09:41:39 -0300 unixmania at gmail.com wrote:

From: Carlos Santos <[email protected]>

Required since the bump from 3.1.1.

---
Do we really need the subdir? I know that qemu keeps four releases but as far as I know Buildroot always included only one. Are there plans to add a configuration to choose the qemu version?

There is already such a version selection:

ifeq ($(BR2_csky),y)
QEMU_VERSION = b517e1dc3125a57555d67a8deed9eac7b42288e2 QEMU_SITE = $(call github,c-sky,qemu,$(QEMU_VERSION)) else
QEMU_VERSION = 3.1.1.1
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = http://download.qemu.org
endif

Quoted 2 lines

So we want the patches to only apply when the upstream 3.1.1.1 version is used, and not when the C-SKY specific version is used.

Hum, looking at their code I guess the C-SKY specific version also needs patch #3 to work with uClibc-ng.

Signature · 1 line
Carlos Santos <[email protected]>