* [Buildroot] [PATCH] package/qemu: bump to version 6.2.0
@ 2022-01-03 16:58 Cédric Le Goater
2022-01-03 20:10 ` Yann E. MORIN
2022-01-03 20:19 ` Romain Naour
0 siblings, 2 replies; 9+ messages in thread
From: Cédric Le Goater @ 2022-01-03 16:58 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Cédric Le Goater
Remove uclibc workaround which was deprecated by upstream :
commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h")
Remove upstream patches :
commit 304332039014 ("block/export/fuse.c: fix musl build")
commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl")
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
...age-of-mcontext-structure-on-ARM-uCl.patch | 35 -------------
...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 -----------------
...4-block-export-fuse.c-fix-musl-build.patch | 49 -------------------
package/qemu/qemu.hash | 2 +-
package/qemu/qemu.mk | 2 +-
5 files changed, 2 insertions(+), 130 deletions(-)
delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch
diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
deleted file mode 100644
index 6db4e8bc923e..000000000000
--- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 5 May 2017 09:07:15 +0200
-Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc
-
-user-exec.c has some conditional code to decide how to use the
-mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but
-with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path
-gets used, which doesn't apply to uClibc.
-
-Fix this by excluding __UCLIBC__, which ensures we fall back to the
-general case of using uc_mcontext.arm_pc, which works fine with
-uClibc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- accel/tcg/user-exec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
-index 4ebe25461a..0496674fbd 100644
---- a/accel/tcg/user-exec.c
-+++ b/accel/tcg/user-exec.c
-@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo,
-
- #if defined(__NetBSD__)
- pc = uc->uc_mcontext.__gregs[_REG_R15];
--#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
-+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3))
- pc = uc->uc_mcontext.gregs[R15];
- #else
- pc = uc->uc_mcontext.arm_pc;
---
-2.25.3
-
diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
deleted file mode 100644
index 50762055bf18..000000000000
--- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 27 Aug 2021 23:40:01 +0200
-Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl
-
-Include linux/fs.h to avoid the following build failure on uclibc or
-musl raised since version 6.0.0:
-
-../block/export/fuse.c: In function 'fuse_lseek':
-../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function)
- 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) {
- | ^~~~~~~~~
-../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in
-../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'?
- 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) {
- | ^~~~~~~~~
- | SEEK_SET
-
-Fixes:
- - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/]
----
- block/export/fuse.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/block/export/fuse.c b/block/export/fuse.c
-index fc7b07d2b5..2e3bf8270b 100644
---- a/block/export/fuse.c
-+++ b/block/export/fuse.c
-@@ -31,6 +31,9 @@
- #include <fuse.h>
- #include <fuse_lowlevel.h>
-
-+#ifdef __linux__
-+#include <linux/fs.h>
-+#endif
-
- /* Prevent overly long bounce buffer allocations */
- #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024))
---
-2.32.0
-
diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch
deleted file mode 100644
index 4856821843fc..000000000000
--- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Fri, 22 Oct 2021 11:52:09 +0200
-Subject: [PATCH] block/export/fuse.c: fix musl build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix
-https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb
-and avoid the following build failure on musl:
-
-../block/export/fuse.c: In function 'fuse_fallocate':
-../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
- 643 | else if (mode & FALLOC_FL_ZERO_RANGE) {
- | ^~~~~~~~~~~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b
-
-Fixes: 50482fda98b ("block/export/fuse.c: fix musl build")
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-[Retrieved from:
-https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451]
----
- block/export/fuse.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/block/export/fuse.c b/block/export/fuse.c
-index 2e3bf8270b..823c126d23 100644
---- a/block/export/fuse.c
-+++ b/block/export/fuse.c
-@@ -31,6 +31,10 @@
- #include <fuse.h>
- #include <fuse_lowlevel.h>
-
-+#if defined(CONFIG_FALLOCATE_ZERO_RANGE)
-+#include <linux/falloc.h>
-+#endif
-+
- #ifdef __linux__
- #include <linux/fs.h>
- #endif
---
-GitLab
-
diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
index 0613fce49367..9411832384ba 100644
--- a/package/qemu/qemu.hash
+++ b/package/qemu/qemu.hash
@@ -1,4 +1,4 @@
# Locally computed, tarball verified with GPG signature
-sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz
+sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 919aef6599f1..97f9f885a18a 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-QEMU_VERSION = 6.1.0
+QEMU_VERSION = 6.2.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
QEMU_SITE = http://download.qemu.org
QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 16:58 [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 Cédric Le Goater @ 2022-01-03 20:10 ` Yann E. MORIN 2022-01-03 20:19 ` Romain Naour 1 sibling, 0 replies; 9+ messages in thread From: Yann E. MORIN @ 2022-01-03 20:10 UTC (permalink / raw) To: Cédric Le Goater; +Cc: Romain Naour, buildroot Cédric, All, On 2022-01-03 17:58 +0100, Cédric Le Goater spake thusly: > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied to master, thanks. Regards, Yann E. MORIN. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include <fuse.h> > - #include <fuse_lowlevel.h> > - > -+#ifdef __linux__ > -+#include <linux/fs.h> > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com> > -Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > -Signed-off-by: Kevin Wolf <kwolf@redhat.com> > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include <fuse.h> > - #include <fuse_lowlevel.h> > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include <linux/falloc.h> > -+#endif > -+ > - #ifdef __linux__ > - #include <linux/fs.h> > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 16:58 [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 Cédric Le Goater 2022-01-03 20:10 ` Yann E. MORIN @ 2022-01-03 20:19 ` Romain Naour 2022-01-03 21:26 ` Cédric Le Goater 1 sibling, 1 reply; 9+ messages in thread From: Romain Naour @ 2022-01-03 20:19 UTC (permalink / raw) To: Cédric Le Goater, buildroot Hi Cédric, All, Le 03/01/2022 à 17:58, Cédric Le Goater a écrit : > Remove uclibc workaround which was deprecated by upstream : > commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") > > Remove upstream patches : > commit 304332039014 ("block/export/fuse.c: fix musl build") > commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") > > Signed-off-by: Cédric Le Goater <clg@kaod.org> I did a similar commit to test all qemu defconfig in gitlab-ci: https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 No problem detected so far, I was investigating why the s390x defconfig failed for me... It would be great if you can do a runtime test in gitlab and add the link in the commit log. > --- > ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- > ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- > ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- > package/qemu/qemu.hash | 2 +- > package/qemu/qemu.mk | 2 +- > 5 files changed, 2 insertions(+), 130 deletions(-) > delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > > diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > deleted file mode 100644 > index 6db4e8bc923e..000000000000 > --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -Date: Fri, 5 May 2017 09:07:15 +0200 > -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc > - > -user-exec.c has some conditional code to decide how to use the > -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but > -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path > -gets used, which doesn't apply to uClibc. > - > -Fix this by excluding __UCLIBC__, which ensures we fall back to the > -general case of using uc_mcontext.arm_pc, which works fine with > -uClibc. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > ---- > - accel/tcg/user-exec.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > -index 4ebe25461a..0496674fbd 100644 > ---- a/accel/tcg/user-exec.c > -+++ b/accel/tcg/user-exec.c > -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, > - > - #if defined(__NetBSD__) > - pc = uc->uc_mcontext.__gregs[_REG_R15]; > --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > - pc = uc->uc_mcontext.gregs[R15]; > - #else > - pc = uc->uc_mcontext.arm_pc; > --- > -2.25.3 > - > diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > deleted file mode 100644 > index 50762055bf18..000000000000 > --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch > +++ /dev/null > @@ -1,44 +0,0 @@ > -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Fri, 27 Aug 2021 23:40:01 +0200 > -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl > - > -Include linux/fs.h to avoid the following build failure on uclibc or > -musl raised since version 6.0.0: > - > -../block/export/fuse.c: In function 'fuse_lseek': > -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in > -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? > - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { > - | ^~~~~~~~~ > - | SEEK_SET > - > -Fixes: > - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 > - > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/] > ---- > - block/export/fuse.c | 3 +++ > - 1 file changed, 3 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index fc7b07d2b5..2e3bf8270b 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,9 @@ > - #include <fuse.h> > - #include <fuse_lowlevel.h> > - > -+#ifdef __linux__ > -+#include <linux/fs.h> > -+#endif > - > - /* Prevent overly long bounce buffer allocations */ > - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) > --- > -2.32.0 > - > diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > deleted file mode 100644 > index 4856821843fc..000000000000 > --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch > +++ /dev/null > @@ -1,49 +0,0 @@ > -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 > -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Date: Fri, 22 Oct 2021 11:52:09 +0200 > -Subject: [PATCH] block/export/fuse.c: fix musl build > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix > -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb > -and avoid the following build failure on musl: > - > -../block/export/fuse.c: In function 'fuse_fallocate': > -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) > - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { > - | ^~~~~~~~~~~~~~~~~~~~ > - > -Fixes: > - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b > - > -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com> > -Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > -Signed-off-by: Kevin Wolf <kwolf@redhat.com> > -[Retrieved from: > -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] > ---- > - block/export/fuse.c | 4 ++++ > - 1 file changed, 4 insertions(+) > - > -diff --git a/block/export/fuse.c b/block/export/fuse.c > -index 2e3bf8270b..823c126d23 100644 > ---- a/block/export/fuse.c > -+++ b/block/export/fuse.c > -@@ -31,6 +31,10 @@ > - #include <fuse.h> > - #include <fuse_lowlevel.h> > - > -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) > -+#include <linux/falloc.h> > -+#endif > -+ > - #ifdef __linux__ > - #include <linux/fs.h> > - #endif > --- > -GitLab > - > diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash > index 0613fce49367..9411832384ba 100644 > --- a/package/qemu/qemu.hash > +++ b/package/qemu/qemu.hash > @@ -1,4 +1,4 @@ > # Locally computed, tarball verified with GPG signature > -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz > +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz > sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index 919aef6599f1..97f9f885a18a 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > > -QEMU_VERSION = 6.1.0 > +QEMU_VERSION = 6.2.0 > QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz > QEMU_SITE = http://download.qemu.org > QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c > Please check qemu configure options while doing a version bump, there are a lot of new option added: https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e Best regards, Romain _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 20:19 ` Romain Naour @ 2022-01-03 21:26 ` Cédric Le Goater 2022-01-03 21:39 ` Romain Naour 0 siblings, 1 reply; 9+ messages in thread From: Cédric Le Goater @ 2022-01-03 21:26 UTC (permalink / raw) To: Romain Naour, buildroot On 1/3/22 21:19, Romain Naour wrote: > Hi Cédric, All, > > Le 03/01/2022 à 17:58, Cédric Le Goater a écrit : >> Remove uclibc workaround which was deprecated by upstream : >> commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >> >> Remove upstream patches : >> commit 304332039014 ("block/export/fuse.c: fix musl build") >> commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> > > I did a similar commit to test all qemu defconfig in gitlab-ci: > > https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 > > No problem detected so far, I was investigating why the s390x defconfig failed > for me... > > It would be great if you can do a runtime test in gitlab and add the link in the > commit log. I did a few runs with test branches but I didn't find a way to run only the qemu board boot tests. How did you do that ? >> --- >> ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >> ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >> ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >> package/qemu/qemu.hash | 2 +- >> package/qemu/qemu.mk | 2 +- >> 5 files changed, 2 insertions(+), 130 deletions(-) >> delete mode 100644 package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> delete mode 100644 package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> >> diff --git a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> deleted file mode 100644 >> index 6db4e8bc923e..000000000000 >> --- a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >> +++ /dev/null >> @@ -1,35 +0,0 @@ >> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >> -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >> -Date: Fri, 5 May 2017 09:07:15 +0200 >> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >> - >> -user-exec.c has some conditional code to decide how to use the >> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >> -gets used, which doesn't apply to uClibc. >> - >> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >> -general case of using uc_mcontext.arm_pc, which works fine with >> -uClibc. >> - >> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >> ---- >> - accel/tcg/user-exec.c | 2 +- >> - 1 file changed, 1 insertion(+), 1 deletion(-) >> - >> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >> -index 4ebe25461a..0496674fbd 100644 >> ---- a/accel/tcg/user-exec.c >> -+++ b/accel/tcg/user-exec.c >> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >> - >> - #if defined(__NetBSD__) >> - pc = uc->uc_mcontext.__gregs[_REG_R15]; >> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >> - pc = uc->uc_mcontext.gregs[R15]; >> - #else >> - pc = uc->uc_mcontext.arm_pc; >> --- >> -2.25.3 >> - >> diff --git a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> deleted file mode 100644 >> index 50762055bf18..000000000000 >> --- a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >> +++ /dev/null >> @@ -1,44 +0,0 @@ >> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >> - >> -Include linux/fs.h to avoid the following build failure on uclibc or >> -musl raised since version 6.0.0: >> - >> -../block/export/fuse.c: In function 'fuse_lseek': >> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in this function) >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported only once for each function it appears in >> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in this function); did you mean 'SEEK_SET'? >> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >> - | ^~~~~~~~~ >> - | SEEK_SET >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >> - >> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> -[Upstream status: https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/] >> ---- >> - block/export/fuse.c | 3 +++ >> - 1 file changed, 3 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index fc7b07d2b5..2e3bf8270b 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,9 @@ >> - #include <fuse.h> >> - #include <fuse_lowlevel.h> >> - >> -+#ifdef __linux__ >> -+#include <linux/fs.h> >> -+#endif >> - >> - /* Prevent overly long bounce buffer allocations */ >> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >> --- >> -2.32.0 >> - >> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> deleted file mode 100644 >> index 4856821843fc..000000000000 >> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >> +++ /dev/null >> @@ -1,49 +0,0 @@ >> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >> -Subject: [PATCH] block/export/fuse.c: fix musl build >> -MIME-Version: 1.0 >> -Content-Type: text/plain; charset=UTF-8 >> -Content-Transfer-Encoding: 8bit >> - >> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >> -and avoid the following build failure on musl: >> - >> -../block/export/fuse.c: In function 'fuse_fallocate': >> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) >> - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { >> - | ^~~~~~~~~~~~~~~~~~~~ >> - >> -Fixes: >> - - http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >> - >> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com> >> -Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> -Signed-off-by: Kevin Wolf <kwolf@redhat.com> >> -[Retrieved from: >> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >> ---- >> - block/export/fuse.c | 4 ++++ >> - 1 file changed, 4 insertions(+) >> - >> -diff --git a/block/export/fuse.c b/block/export/fuse.c >> -index 2e3bf8270b..823c126d23 100644 >> ---- a/block/export/fuse.c >> -+++ b/block/export/fuse.c >> -@@ -31,6 +31,10 @@ >> - #include <fuse.h> >> - #include <fuse_lowlevel.h> >> - >> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >> -+#include <linux/falloc.h> >> -+#endif >> -+ >> - #ifdef __linux__ >> - #include <linux/fs.h> >> - #endif >> --- >> -GitLab >> - >> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >> index 0613fce49367..9411832384ba 100644 >> --- a/package/qemu/qemu.hash >> +++ b/package/qemu/qemu.hash >> @@ -1,4 +1,4 @@ >> # Locally computed, tarball verified with GPG signature >> -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz >> +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 qemu-6.2.0.tar.xz >> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING >> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB >> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >> index 919aef6599f1..97f9f885a18a 100644 >> --- a/package/qemu/qemu.mk >> +++ b/package/qemu/qemu.mk >> @@ -4,7 +4,7 @@ >> # >> ################################################################################ >> >> -QEMU_VERSION = 6.1.0 >> +QEMU_VERSION = 6.2.0 >> QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >> QEMU_SITE = http://download.qemu.org >> QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c >> > > Please check qemu configure options while doing a version bump, there are a lot > of new option added: yes. QEMU is very much alive. > https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e I suppose you disable options to reduce compile time ? Thanks, C. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 21:26 ` Cédric Le Goater @ 2022-01-03 21:39 ` Romain Naour 2022-01-03 22:20 ` Cédric Le Goater 0 siblings, 1 reply; 9+ messages in thread From: Romain Naour @ 2022-01-03 21:39 UTC (permalink / raw) To: Cédric Le Goater, buildroot Hello, Le 03/01/2022 à 22:26, Cédric Le Goater a écrit : > On 1/3/22 21:19, Romain Naour wrote: >> Hi Cédric, All, >> >> Le 03/01/2022 à 17:58, Cédric Le Goater a écrit : >>> Remove uclibc workaround which was deprecated by upstream : >>> commit a30bfaa7bd1f ("linux-user/host/arm: Populate host_signal.h") >>> >>> Remove upstream patches : >>> commit 304332039014 ("block/export/fuse.c: fix musl build") >>> commit 28031d5c7427 ("block/export/fuse.c: fix fuse-lseek on uclibc or musl") >>> >>> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> >> I did a similar commit to test all qemu defconfig in gitlab-ci: >> >> https://gitlab.com/kubu93/buildroot/-/pipelines/438162421 >> >> No problem detected so far, I was investigating why the s390x defconfig failed >> for me... >> >> It would be great if you can do a runtime test in gitlab and add the link in the >> commit log. > > I did a few runs with test branches but I didn't find a way to run only > the qemu board boot tests. How did you do that ? Ok, I'll try to find some time to document how to use gitlab for qemu testing (see also recent changes in gitlab-ci) Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. Create a test branch named: qemu-6.2.0-defconfigs-qemu Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing Buildroot defconfis and "qemu" is a pattern. See: https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 "pushing a branch called "<foo>-defconfigs-<pattern>" which will test all defconfigs whose name start with the pattern." > > >>> --- >>> ...age-of-mcontext-structure-on-ARM-uCl.patch | 35 ------------- >>> ...e.c-fix-fuse-lseek-on-uclibc-or-musl.patch | 44 ----------------- >>> ...4-block-export-fuse.c-fix-musl-build.patch | 49 ------------------- >>> package/qemu/qemu.hash | 2 +- >>> package/qemu/qemu.mk | 2 +- >>> 5 files changed, 2 insertions(+), 130 deletions(-) >>> delete mode 100644 >>> package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> delete mode 100644 >>> package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> delete mode 100644 package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> >>> diff --git >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch b/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> >>> deleted file mode 100644 >>> index 6db4e8bc923e..000000000000 >>> --- >>> a/package/qemu/0001-user-exec-fix-usage-of-mcontext-structure-on-ARM-uCl.patch >>> +++ /dev/null >>> @@ -1,35 +0,0 @@ >>> -From 923d25365fbdff17fa4c8c2883960be07c3dad56 Mon Sep 17 00:00:00 2001 >>> -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >>> -Date: Fri, 5 May 2017 09:07:15 +0200 >>> -Subject: [PATCH] user-exec: fix usage of mcontext structure on ARM/uClibc >>> - >>> -user-exec.c has some conditional code to decide how to use the >>> -mcontext structure. Unfortunately, since uClibc defines __GLIBC__, but >>> -with old versions of __GLIBC__ and __GLIBC_MINOR__, an old code path >>> -gets used, which doesn't apply to uClibc. >>> - >>> -Fix this by excluding __UCLIBC__, which ensures we fall back to the >>> -general case of using uc_mcontext.arm_pc, which works fine with >>> -uClibc. >>> - >>> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> >>> ---- >>> - accel/tcg/user-exec.c | 2 +- >>> - 1 file changed, 1 insertion(+), 1 deletion(-) >>> - >>> -diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c >>> -index 4ebe25461a..0496674fbd 100644 >>> ---- a/accel/tcg/user-exec.c >>> -+++ b/accel/tcg/user-exec.c >>> -@@ -540,7 +540,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, >>> - >>> - #if defined(__NetBSD__) >>> - pc = uc->uc_mcontext.__gregs[_REG_R15]; >>> --#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && >>> __GLIBC_MINOR__ <= 3)) >>> -+#elif defined(__GLIBC__) && !defined(__UCLIBC__) && (__GLIBC__ < 2 || >>> (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) >>> - pc = uc->uc_mcontext.gregs[R15]; >>> - #else >>> - pc = uc->uc_mcontext.arm_pc; >>> --- >>> -2.25.3 >>> - >>> diff --git >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch b/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> >>> deleted file mode 100644 >>> index 50762055bf18..000000000000 >>> --- >>> a/package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch >>> +++ /dev/null >>> @@ -1,44 +0,0 @@ >>> -From 8c3fcbf23fe31cf56f21ce1737bf22fe65fc553b Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> -Date: Fri, 27 Aug 2021 23:40:01 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix fuse-lseek on uclibc or musl >>> - >>> -Include linux/fs.h to avoid the following build failure on uclibc or >>> -musl raised since version 6.0.0: >>> - >>> -../block/export/fuse.c: In function 'fuse_lseek': >>> -../block/export/fuse.c:641:19: error: 'SEEK_HOLE' undeclared (first use in >>> this function) >>> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> - | ^~~~~~~~~ >>> -../block/export/fuse.c:641:19: note: each undeclared identifier is reported >>> only once for each function it appears in >>> -../block/export/fuse.c:641:42: error: 'SEEK_DATA' undeclared (first use in >>> this function); did you mean 'SEEK_SET'? >>> - 641 | if (whence != SEEK_HOLE && whence != SEEK_DATA) { >>> - | ^~~~~~~~~ >>> - | SEEK_SET >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/33c90ebf04997f4d3557cfa66abc9cf9a3076137 >>> - >>> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> -[Upstream status: >>> https://patchwork.ozlabs.org/project/qemu-devel/patch/20210827220301.272887-1-fontaine.fabrice@gmail.com/] >>> >>> ---- >>> - block/export/fuse.c | 3 +++ >>> - 1 file changed, 3 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index fc7b07d2b5..2e3bf8270b 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,9 @@ >>> - #include <fuse.h> >>> - #include <fuse_lowlevel.h> >>> - >>> -+#ifdef __linux__ >>> -+#include <linux/fs.h> >>> -+#endif >>> - >>> - /* Prevent overly long bounce buffer allocations */ >>> - #define FUSE_MAX_BOUNCE_BYTES (MIN(BDRV_REQUEST_MAX_BYTES, 64 * 1024 * 1024)) >>> --- >>> -2.32.0 >>> - >>> diff --git a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> b/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> deleted file mode 100644 >>> index 4856821843fc..000000000000 >>> --- a/package/qemu/0004-block-export-fuse.c-fix-musl-build.patch >>> +++ /dev/null >>> @@ -1,49 +0,0 @@ >>> -From 304332039014679b809f606e2f227ee0fc43a451 Mon Sep 17 00:00:00 2001 >>> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> -Date: Fri, 22 Oct 2021 11:52:09 +0200 >>> -Subject: [PATCH] block/export/fuse.c: fix musl build >>> -MIME-Version: 1.0 >>> -Content-Type: text/plain; charset=UTF-8 >>> -Content-Transfer-Encoding: 8bit >>> - >>> -Include linux/falloc.h if CONFIG_FALLOCATE_ZERO_RANGE is defined to fix >>> -https://gitlab.com/qemu-project/qemu/-/commit/50482fda98bd62e072c30b7ea73c985c4e9d9bbb >>> >>> -and avoid the following build failure on musl: >>> - >>> -../block/export/fuse.c: In function 'fuse_fallocate': >>> -../block/export/fuse.c:643:21: error: 'FALLOC_FL_ZERO_RANGE' undeclared >>> (first use in this function) >>> - 643 | else if (mode & FALLOC_FL_ZERO_RANGE) { >>> - | ^~~~~~~~~~~~~~~~~~~~ >>> - >>> -Fixes: >>> - - >>> http://autobuild.buildroot.org/results/be24433a429fda681fb66698160132c1c99bc53b >>> - >>> -Fixes: 50482fda98b ("block/export/fuse.c: fix musl build") >>> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >>> -Message-Id: <20211022095209.1319671-1-fontaine.fabrice@gmail.com> >>> -Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> -Signed-off-by: Kevin Wolf <kwolf@redhat.com> >>> -[Retrieved from: >>> -https://gitlab.com/qemu-project/qemu/-/commit/304332039014679b809f606e2f227ee0fc43a451] >>> >>> ---- >>> - block/export/fuse.c | 4 ++++ >>> - 1 file changed, 4 insertions(+) >>> - >>> -diff --git a/block/export/fuse.c b/block/export/fuse.c >>> -index 2e3bf8270b..823c126d23 100644 >>> ---- a/block/export/fuse.c >>> -+++ b/block/export/fuse.c >>> -@@ -31,6 +31,10 @@ >>> - #include <fuse.h> >>> - #include <fuse_lowlevel.h> >>> - >>> -+#if defined(CONFIG_FALLOCATE_ZERO_RANGE) >>> -+#include <linux/falloc.h> >>> -+#endif >>> -+ >>> - #ifdef __linux__ >>> - #include <linux/fs.h> >>> - #endif >>> --- >>> -GitLab >>> - >>> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash >>> index 0613fce49367..9411832384ba 100644 >>> --- a/package/qemu/qemu.hash >>> +++ b/package/qemu/qemu.hash >>> @@ -1,4 +1,4 @@ >>> # Locally computed, tarball verified with GPG signature >>> -sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 >>> qemu-6.1.0.tar.xz >>> +sha256 68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45 >>> qemu-6.2.0.tar.xz >>> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 >>> COPYING >>> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 >>> COPYING.LIB >>> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk >>> index 919aef6599f1..97f9f885a18a 100644 >>> --- a/package/qemu/qemu.mk >>> +++ b/package/qemu/qemu.mk >>> @@ -4,7 +4,7 @@ >>> # >>> >>> ################################################################################ >>> -QEMU_VERSION = 6.1.0 >>> +QEMU_VERSION = 6.2.0 >>> QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz >>> QEMU_SITE = http://download.qemu.org >>> QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, >>> Others/BSD-1c >>> >> >> Please check qemu configure options while doing a version bump, there are a lot >> of new option added: > > yes. QEMU is very much alive. > >> https://gitlab.com/kubu93/buildroot/-/commit/bb7e076c0e8960de81f664a138b33a3d736cdd0e >> > > I suppose you disable options to reduce compile time ? I'm more concerned about qemu dependencies. host-qemu must avoid linking with libraries installed on the host (unpredictable build and runtime result). Best regards, Romain > > Thanks, > > C. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 21:39 ` Romain Naour @ 2022-01-03 22:20 ` Cédric Le Goater 2022-01-03 22:43 ` Romain Naour 0 siblings, 1 reply; 9+ messages in thread From: Cédric Le Goater @ 2022-01-03 22:20 UTC (permalink / raw) To: Romain Naour, buildroot Hello, > Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. > > Create a test branch named: qemu-6.2.0-defconfigs-qemu > > Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing > Buildroot defconfis and "qemu" is a pattern. > > See: > https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 > > "pushing a branch called "<foo>-defconfigs-<pattern>" which will test all > defconfigs whose name start with the pattern." That looks simple enough. Something is going wrong though : https://gitlab.com/legoater/buildroot/-/jobs/1937752353 Am I missing something ? Thanks, C. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 22:20 ` Cédric Le Goater @ 2022-01-03 22:43 ` Romain Naour 2022-01-04 9:05 ` Cédric Le Goater 0 siblings, 1 reply; 9+ messages in thread From: Romain Naour @ 2022-01-03 22:43 UTC (permalink / raw) To: Cédric Le Goater, buildroot Le 03/01/2022 à 23:20, Cédric Le Goater a écrit : > Hello, >> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >> >> Create a test branch named: qemu-6.2.0-defconfigs-qemu >> >> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >> Buildroot defconfis and "qemu" is a pattern. >> >> See: >> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >> >> >> "pushing a branch called "<foo>-defconfigs-<pattern>" which will test all >> defconfigs whose name start with the pattern." > > That looks simple enough. Something is going wrong though : > > https://gitlab.com/legoater/buildroot/-/jobs/1937752353 > > Am I missing something ? humm, maybe there is weakness in the script when foo is "qemu-6.2.0" ^ Try again with something else like qemu_6.2.0-defconfigs-qemu Best regards, Romain > > Thanks, > > C. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-03 22:43 ` Romain Naour @ 2022-01-04 9:05 ` Cédric Le Goater 2022-01-06 10:38 ` Romain Naour 0 siblings, 1 reply; 9+ messages in thread From: Cédric Le Goater @ 2022-01-04 9:05 UTC (permalink / raw) To: Romain Naour, buildroot Hello, On 1/3/22 23:43, Romain Naour wrote: > Le 03/01/2022 à 23:20, Cédric Le Goater a écrit : >> Hello, >>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>> >>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>> >>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>> Buildroot defconfis and "qemu" is a pattern. >>> >>> See: >>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>> >>> >>> "pushing a branch called "<foo>-defconfigs-<pattern>" which will test all >>> defconfigs whose name start with the pattern." >> >> That looks simple enough. Something is going wrong though : >> >> https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >> >> Am I missing something ? > > humm, maybe there is weakness in the script when foo is "qemu-6.2.0" > ^ > Try again with something else like qemu_6.2.0-defconfigs-qemu Yes. That was it. Thanks, C. _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 2022-01-04 9:05 ` Cédric Le Goater @ 2022-01-06 10:38 ` Romain Naour 0 siblings, 0 replies; 9+ messages in thread From: Romain Naour @ 2022-01-06 10:38 UTC (permalink / raw) To: Cédric Le Goater, Romain Naour, buildroot, Thomas Petazzoni Hello, Le 04/01/2022 à 10:05, Cédric Le Goater a écrit : > Hello, > > On 1/3/22 23:43, Romain Naour wrote: >> Le 03/01/2022 à 23:20, Cédric Le Goater a écrit : >>> Hello, >>>> Unlike all other defconfig, qemu defconfigs are runtime tested in gitlab. >>>> >>>> Create a test branch named: qemu-6.2.0-defconfigs-qemu >>>> >>>> Where: "qemu-6.2.0" is a prefix, "-defconfigs-" trigger a pipeline for testing >>>> Buildroot defconfis and "qemu" is a pattern. >>>> >>>> See: >>>> https://gitlab.com/buildroot.org/buildroot/-/commit/65d2f04c012af492a9b9da04dfa3b3cbd20347f1 >>>> >>>> >>>> >>>> "pushing a branch called "<foo>-defconfigs-<pattern>" which will test all >>>> defconfigs whose name start with the pattern." >>> >>> That looks simple enough. Something is going wrong though : >>> >>> https://gitlab.com/legoater/buildroot/-/jobs/1937752353 >>> >>> Am I missing something ? >> >> humm, maybe there is weakness in the script when foo is "qemu-6.2.0" >> ^ >> Try again with something else like qemu_6.2.0-defconfigs-qemu > > Yes. That was it. @Thomas: maybe ignore all characters before "-defconfigs": sed 's%^.*-defconfigs-\(.*\)%\1%')sed 's%^.*-defconfigs-\(.*\)%\1%') Best regards, Romain > > Thanks, > > C. > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-01-06 10:38 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-01-03 16:58 [Buildroot] [PATCH] package/qemu: bump to version 6.2.0 Cédric Le Goater 2022-01-03 20:10 ` Yann E. MORIN 2022-01-03 20:19 ` Romain Naour 2022-01-03 21:26 ` Cédric Le Goater 2022-01-03 21:39 ` Romain Naour 2022-01-03 22:20 ` Cédric Le Goater 2022-01-03 22:43 ` Romain Naour 2022-01-04 9:05 ` Cédric Le Goater 2022-01-06 10:38 ` Romain Naour
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox