Message ID | 20191021124139.28615-1-unixmania@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | package/qemu: move patch 3 to the 3.1.1.1 subdir | expand |
Hello Carlos, On Mon, 21 Oct 2019 09:41:39 -0300 unixmania@gmail.com wrote: > From: Carlos Santos <unixmania@gmail.com> > > Required since the bump from 3.1.1. > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > --- > 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. > ...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
On Mon, Oct 21, 2019 at 2:09 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > Hello Carlos, > > On Mon, 21 Oct 2019 09:41:39 -0300 > unixmania@gmail.com wrote: > > > From: Carlos Santos <unixmania@gmail.com> > > > > Required since the bump from 3.1.1. > > > > Signed-off-by: Carlos Santos <unixmania@gmail.com> > > --- > > 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. Hum, looking at their code I guess the C-SKY specific version also needs patch #3 to work with uClibc-ng.
>>>>> "unixmania" == unixmania <unixmania@gmail.com> writes: > From: Carlos Santos <unixmania@gmail.com> > Required since the bump from 3.1.1. > Signed-off-by: Carlos Santos <unixmania@gmail.com> Committed to 2019.02.x and 2019.08.x, thanks.
diff --git a/package/qemu/3.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/package/qemu/3.1.1.1/0003-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch
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