Skip to contentSkip to conversation

package/qemu: change project and download URL to https

PATCH Applied Peter Seiderer 4 participants 13 messages Apr 22, 2023 – Jun 13, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/qemu: change project and download URL to https

---
 package/qemu/Config.in | 2 +-
 package/qemu/qemu.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/qemu/Config.in +1 -1
index a446c0cf68..235fdb9ce6 100644
@@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU
 	  Linux. When using KVM, QEMU can virtualize x86, server and
 	  embedded PowerPC, and S390 guests.
 
-	  http://qemu.org/
+	  https://www.qemu.org/
 
 if BR2_PACKAGE_QEMU
 
package/qemu/qemu.mk +1 -1
index 3cbeffe213..3f51cb572b 100644
@@ -8,7 +8,7 @@
 # needs to be updated.
 QEMU_VERSION = 7.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
-QEMU_SITE = http://download.qemu.org
+QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
 QEMU_LICENSE_FILES = COPYING COPYING.LIB
 # NOTE: there is no top-level license file for non-(L)GPL licenses;
Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/3 package/qemu: bump version to 7.2.1

- remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1])

[1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791

---
 ...k-restore-of-env-flags-from-tb-flags.patch | 36 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch
package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted +0 -36
deleted file mode 100644
index 8dc2dd8823..0000000000
@@ -1,36 +0,0 @@
-From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001
-From: Guenter Roeck <[email protected]>
-Date: Mon, 12 Dec 2022 09:03:17 -0600
-Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags
-
-The values in env->flags are a subset of tb->flags.
-Restore only the bits that belong.
-
-Cc: [email protected]
-Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN")
-Signed-off-by: Guenter Roeck <[email protected]>
-Message-ID: <[email protected]>
-[rth: Reduce to only the the superh_cpu_synchronize_from_tb change]
-Signed-off-by: Richard Henderson <[email protected]>
-[[email protected]: backport from upstream]
-Signed-off-by: Yann E. MORIN <[email protected]>
----
- target/sh4/cpu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
-index 951eb6b9c8..f0934b20fa 100644
---- a/target/sh4/cpu.c
-+++ b/target/sh4/cpu.c
-@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs,
-     SuperHCPU *cpu = SUPERH_CPU(cs);
- 
-     cpu->env.pc = tb_pc(tb);
--    cpu->env.flags = tb->flags;
-+    cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
- }
- 
- static void superh_restore_state_to_opc(CPUState *cs,
--- 
-2.25.1
-
package/qemu/qemu.hash +1 -1
index e671e1d184..93f7c98f1c 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157  qemu-7.2.0.tar.xz
+sha256  8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b  qemu-7.2.1.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +1 -1
index 3f51cb572b..12d52f61bf 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 7.2.0
+QEMU_VERSION = 7.2.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH v1 2/3] package/qemu: bump version to 7.2.1

Hello Peter,

Le 22/04/2023 à 11:06, Peter Seiderer a écrit :

Quoted 4 lines

- remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1])

[1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791

Qemu 8.0.0 has been released this week including the patch 0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch

See: https://gitlab.com/kubu93/buildroot/-/pipelines/845076149

Best regards,
Romain

Quoted 66 lines
---
 ...k-restore-of-env-flags-from-tb-flags.patch | 36 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch
package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted +0 -36
deleted file mode 100644
index 8dc2dd8823..0000000000
@@ -1,36 +0,0 @@
-From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001
-From: Guenter Roeck <[email protected]>
-Date: Mon, 12 Dec 2022 09:03:17 -0600
-Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags
-
-The values in env->flags are a subset of tb->flags.
-Restore only the bits that belong.
-
-Cc: [email protected]
-Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN")
-Signed-off-by: Guenter Roeck <[email protected]>
-Message-ID: <[email protected]>
-[rth: Reduce to only the the superh_cpu_synchronize_from_tb change]
-Signed-off-by: Richard Henderson <[email protected]>
-[[email protected]: backport from upstream]
-Signed-off-by: Yann E. MORIN <[email protected]>
----
- target/sh4/cpu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
-index 951eb6b9c8..f0934b20fa 100644
---- a/target/sh4/cpu.c
-+++ b/target/sh4/cpu.c
-@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs,
-     SuperHCPU *cpu = SUPERH_CPU(cs);
- 
-     cpu->env.pc = tb_pc(tb);
--    cpu->env.flags = tb->flags;
-+    cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
- }
- 
- static void superh_restore_state_to_opc(CPUState *cs,
--- 
-2.25.1
-
package/qemu/qemu.hash +1 -1
index e671e1d184..93f7c98f1c 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157  qemu-7.2.0.tar.xz
+sha256  8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b  qemu-7.2.1.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +0 -0
index 3f51cb572b..12d52f61bf 100644

package/qemu/qemu.mk line 12

Quoted 8 lines
package/qemu/qemu.mk +1 -1
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 7.2.0
+QEMU_VERSION = 7.2.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Re: [Buildroot] [PATCH v1 2/3] package/qemu: bump version to 7.2.1

In reply to Peter Seiderer

Peter, All,

On 2023-04-22 11:06 +0200, Peter Seiderer spake thusly:

Quoted 6 lines

- remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1])

[1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 79 lines
---
 ...k-restore-of-env-flags-from-tb-flags.patch | 36 -------------------
 package/qemu/qemu.hash                        |  2 +-
 package/qemu/qemu.mk                          |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch
package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted +0 -36
deleted file mode 100644
index 8dc2dd8823..0000000000
@@ -1,36 +0,0 @@
-From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001
-From: Guenter Roeck <[email protected]>
-Date: Mon, 12 Dec 2022 09:03:17 -0600
-Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags
-
-The values in env->flags are a subset of tb->flags.
-Restore only the bits that belong.
-
-Cc: [email protected]
-Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN")
-Signed-off-by: Guenter Roeck <[email protected]>
-Message-ID: <[email protected]>
-[rth: Reduce to only the the superh_cpu_synchronize_from_tb change]
-Signed-off-by: Richard Henderson <[email protected]>
-[[email protected]: backport from upstream]
-Signed-off-by: Yann E. MORIN <[email protected]>
----
- target/sh4/cpu.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
-index 951eb6b9c8..f0934b20fa 100644
---- a/target/sh4/cpu.c
-+++ b/target/sh4/cpu.c
-@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs,
-     SuperHCPU *cpu = SUPERH_CPU(cs);
- 
-     cpu->env.pc = tb_pc(tb);
--    cpu->env.flags = tb->flags;
-+    cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
- }
- 
- static void superh_restore_state_to_opc(CPUState *cs,
--- 
-2.25.1
-
package/qemu/qemu.hash +1 -1
index e671e1d184..93f7c98f1c 100644
@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256  5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157  qemu-7.2.0.tar.xz
+sha256  8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b  qemu-7.2.1.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
package/qemu/qemu.mk +1 -1
index 3f51cb572b..12d52f61bf 100644
@@ -6,7 +6,7 @@
 
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
-QEMU_VERSION = 7.2.0
+QEMU_VERSION = 7.2.1
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH v1 2/3] package/qemu: bump version to 7.2.1

In reply to Peter Seiderer
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

- remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1])

[1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791

Committed to 2023.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

PATCH 3/3 package/qemu: add patches to fix host libc-2.37 compile

In reply to Peter Seiderer

- add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details)

Fixes:

  In file included from /usr/include/linux/btrfs.h:29,
                   from ../linux-user/syscall.c:163:
  /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
     50 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
  ../linux-user/syscall.c:129:8: note: originally defined here
    129 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~

[1] https://lists.openembedded.org/g/openembedded-core/message/177322
[2] https://lore.kernel.org/qemu-devel/[email protected]/

---
 ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++
 ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch
 create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +73 -0
new file mode 100644
index 0000000000..9040daea92
@@ -0,0 +1,73 @@
+From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 24b25759be..10af5e0d8e 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+2.40.0
+
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +82 -0

82 lines not on this page · raw message

Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Reviewed-by on v1 3/3
#6 lore raw

Re: [Buildroot] [PATCH v1 3/3] package/qemu: add patches to fix host libc-2.37 compile

Hello Peter,

Le 22/04/2023 à 11:06, Peter Seiderer a écrit :

Quoted 14 lines

- add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details)

Fixes:

  In file included from /usr/include/linux/btrfs.h:29,
                   from ../linux-user/syscall.c:163:
  /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
     50 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
  ../linux-user/syscall.c:129:8: note: originally defined here
    129 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
Quoted 2 lines

[1] https://lists.openembedded.org/g/openembedded-core/message/177322
[2] https://lore.kernel.org/qemu-devel/[email protected]/

I think we want to backport this patch to 2023.02 branch.

So I rebased the version bump 8.0.0 on top of your series:
http://lists.busybox.net/pipermail/buildroot/2023-April/666603.html

Best regards,
Romain

Quoted 166 lines
---
 ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++
 ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch
 create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +73 -0
new file mode 100644
index 0000000000..9040daea92
@@ -0,0 +1,73 @@
+From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 24b25759be..10af5e0d8e 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+2.40.0
+
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +72 -0
new file mode 100644
index 0000000000..5dbef6d6a4
@@ -0,0 +1,82 @@
+From ec8b232faefcdd7482c4998e64b78d49d0204502 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:01 -0500
+Subject: [PATCH 4/4] Revert "linux-user: fix compat with glibc >= 2.36
+ sys/mount.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 18 ------------------
+ meson.build          |  2 --
+ 2 files changed, 20 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 10af5e0d8e..d974c76b60 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -95,25 +95,7 @@
+ #include <linux/soundcard.h>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
+-#define FS_IOC_GETVERSION              _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION              _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-#else
+ #include <linux/fs.h>
+-#endif
+ #include <linux/fd.h>
+ #if defined(CONFIG_FIEMAP)
+ #include <linux/fiemap.h>
+diff --git a/meson.build b/meson.build
+index b88867ca9d..39e83bbafe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET',
+                      cc.has_header_symbol('getopt.h', 'optreset'))

package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch line 82

Quoted 10 lines
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +10 -0
+ config_host_data.set('HAVE_IPPROTO_MPTCP',
+                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
+-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
+-                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
+ 
+ # has_member
+ config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
+-- 
+2.40.0
+

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#7 lore raw

Re: [Buildroot] [PATCH v1 3/3] package/qemu: add patches to fix host libc-2.37 compile

Le 22/04/2023 à 14:35, Romain Naour a écrit :

Quoted 20 lines

Hello Peter,

Le 22/04/2023 à 11:06, Peter Seiderer a écrit :

Quoted 14 lines

- add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details)

Fixes:

  In file included from /usr/include/linux/btrfs.h:29,
                   from ../linux-user/syscall.c:163:
  /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
     50 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
  ../linux-user/syscall.c:129:8: note: originally defined here
    129 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
Quoted 2 lines

[1] https://lists.openembedded.org/g/openembedded-core/message/177322
[2] https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 6 lines

I think we want to backport this patch to 2023.02 branch.

So I rebased the version bump 8.0.0 on top of your series:
http://lists.busybox.net/pipermail/buildroot/2023-April/666603.html

ping

The issue appear on autobuilder every day:
http://autobuild.buildroot.org/?reason=host-qemu-7.2.0

http://autobuild.buildroot.org/results/c7d/c7de597befbfad0dfc3e35c1585e62ed7dfdf4b1/build-end.log

Best regards,
Romain

Quoted 173 lines

Best regards,
Romain

Quoted 168 lines
---
 ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++
 ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch
 create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +73 -0
new file mode 100644
index 0000000000..9040daea92
@@ -0,0 +1,73 @@
+From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 24b25759be..10af5e0d8e 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+2.40.0
+
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +74 -0
new file mode 100644
index 0000000000..5dbef6d6a4
@@ -0,0 +1,82 @@
+From ec8b232faefcdd7482c4998e64b78d49d0204502 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:01 -0500
+Subject: [PATCH 4/4] Revert "linux-user: fix compat with glibc >= 2.36
+ sys/mount.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 18 ------------------
+ meson.build          |  2 --
+ 2 files changed, 20 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 10af5e0d8e..d974c76b60 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -95,25 +95,7 @@
+ #include <linux/soundcard.h>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
+-#define FS_IOC_GETVERSION              _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION              _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-#else
+ #include <linux/fs.h>
+-#endif
+ #include <linux/fd.h>
+ #if defined(CONFIG_FIEMAP)
+ #include <linux/fiemap.h>
+diff --git a/meson.build b/meson.build
+index b88867ca9d..39e83bbafe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET',
+                      cc.has_header_symbol('getopt.h', 'optreset'))
+ config_host_data.set('HAVE_IPPROTO_MPTCP',
+                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
Quoted 9 lines

package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch line 82

Quoted 8 lines
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +8 -0
+-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
+-                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
+ 
+ # has_member
+ config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
+-- 
+2.40.0
+

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#8 lore raw

Re: [Buildroot] [PATCH v1 3/3] package/qemu: add patches to fix host libc-2.37 compile

In reply to Peter Seiderer

Peter, All,

On 2023-04-22 11:06 +0200, Peter Seiderer spake thusly:

Quoted 31 lines

- add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details)

Fixes:

  In file included from /usr/include/linux/btrfs.h:29,
                   from ../linux-user/syscall.c:163:
  /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
     50 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
  ../linux-user/syscall.c:129:8: note: originally defined here
    129 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~

[1] https://lists.openembedded.org/g/openembedded-core/message/177322
[2] https://lore.kernel.org/qemu-devel/[email protected]/

---
 ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++
 ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch
 create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +0 -0
new file mode 100644
index 0000000000..9040daea92

package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch line 4

Quoted 4 lines
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +4 -0
@@ -0,0 +1,73 @@
+From ba43bb7b641a602081554d7d2a497888209fec2d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:00 -0500
+Subject: [PATCH 3/4] Revert "linux-user: add more compat ioctl definitions"
    $ ./utils/docker-run make check-package
    package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch:4: generate your patches with 'git format-patch -N'
Quoted 15 lines
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +15 -0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release

package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch line 29

Quoted 10 lines
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +10 -0
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a]
    $ ./utils/docker-run make check-package
    package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch:0: missing Upstream in the header (http://nightly.buildroot.org/#_additional_patch_documentation)

I fixed that, and the other patch as well. Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 139 lines
package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file +44 -0
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 25 -------------------------
+ 1 file changed, 25 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 24b25759be..10af5e0d8e 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -111,31 +111,6 @@
+ #define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+ #define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+ #define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+ #else
+ #include <linux/fs.h>
+ #endif
+-- 
+2.40.0
+
package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file +82 -0
new file mode 100644
index 0000000000..5dbef6d6a4
@@ -0,0 +1,82 @@
+From ec8b232faefcdd7482c4998e64b78d49d0204502 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <[email protected]>
+Date: Tue, 10 Jan 2023 12:49:01 -0500
+Subject: [PATCH 4/4] Revert "linux-user: fix compat with glibc >= 2.36
+ sys/mount.h"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
+
+glibc has fixed (in 2.36.9000-40-g774058d729) the problem
+that caused a clash when both sys/mount.h annd linux/mount.h
+are included, and backported this to the 2.36 stable release
+too:
+
+  https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+It is saner for QEMU to remove the workaround it applied for
+glibc 2.36 and expect distros to ship the 2.36 maint release
+with the fix. This avoids needing to add a further workaround
+to QEMU to deal with the fact that linux/brtfs.h now also pulls
+in linux/mount.h via linux/fs.h since Linux 6.1
+
+Signed-off-by: Daniel P. Berrangé <[email protected]>
+Reviewed-by: Marc-André Lureau <[email protected]>
+Message-Id: <[email protected]>
+Signed-off-by: Laurent Vivier <[email protected]>
+
+[Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e]
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ linux-user/syscall.c | 18 ------------------
+ meson.build          |  2 --
+ 2 files changed, 20 deletions(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 10af5e0d8e..d974c76b60 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -95,25 +95,7 @@
+ #include <linux/soundcard.h>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
+-#define FS_IOC_GETVERSION              _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION              _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-#else
+ #include <linux/fs.h>
+-#endif
+ #include <linux/fd.h>
+ #if defined(CONFIG_FIEMAP)
+ #include <linux/fiemap.h>
+diff --git a/meson.build b/meson.build
+index b88867ca9d..39e83bbafe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET',
+                      cc.has_header_symbol('getopt.h', 'optreset'))
+ config_host_data.set('HAVE_IPPROTO_MPTCP',
+                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
+-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
+-                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
+ 
+ # has_member
+ config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
+-- 
+2.40.0
+
Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#9 lore raw

Re: [Buildroot] [PATCH v1 3/3] package/qemu: add patches to fix host libc-2.37 compile

In reply to Peter Seiderer
Quoted 16 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

- add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details)

Fixes:

  In file included from /usr/include/linux/btrfs.h:29,
                   from ../linux-user/syscall.c:163:
  /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’
     50 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
  ../linux-user/syscall.c:129:8: note: originally defined here
    129 | struct file_clone_range {
        |        ^~~~~~~~~~~~~~~~
Quoted 4 lines

[1] https://lists.openembedded.org/g/openembedded-core/message/177322
[2] https://lore.kernel.org/qemu-devel/[email protected]/

Committed to 2023.02.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Acked-by on v1 1/3
#10 lore raw
In reply to Peter Seiderer

Hello Peter,

Le 22/04/2023 à 11:06, Peter Seiderer a écrit :

Quoted 1 line

Best regards,
Romain

Quoted 23 lines
---
 package/qemu/Config.in | 2 +-
 package/qemu/qemu.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/qemu/Config.in +1 -1
index a446c0cf68..235fdb9ce6 100644
@@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU
 	  Linux. When using KVM, QEMU can virtualize x86, server and
 	  embedded PowerPC, and S390 guests.
 
-	  http://qemu.org/
+	  https://www.qemu.org/
 
 if BR2_PACKAGE_QEMU
 
package/qemu/qemu.mk +0 -0
index 3cbeffe213..3f51cb572b 100644

package/qemu/qemu.mk line 14

Quoted 8 lines
package/qemu/qemu.mk +1 -1
@@ -8,7 +8,7 @@
 # needs to be updated.
 QEMU_VERSION = 7.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
-QEMU_SITE = http://download.qemu.org
+QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
 QEMU_LICENSE_FILES = COPYING COPYING.LIB
 # NOTE: there is no top-level license file for non-(L)GPL licenses;

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#11 lore raw
In reply to Peter Seiderer

Peter, All,

On 2023-04-22 11:06 +0200, Peter Seiderer spake thusly:

Quoted 1 line

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 38 lines
---
 package/qemu/Config.in | 2 +-
 package/qemu/qemu.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/qemu/Config.in +1 -1
index a446c0cf68..235fdb9ce6 100644
@@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU
 	  Linux. When using KVM, QEMU can virtualize x86, server and
 	  embedded PowerPC, and S390 guests.
 
-	  http://qemu.org/
+	  https://www.qemu.org/
 
 if BR2_PACKAGE_QEMU
 
package/qemu/qemu.mk +1 -1
index 3cbeffe213..3f51cb572b 100644
@@ -8,7 +8,7 @@
 # needs to be updated.
 QEMU_VERSION = 7.2.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
-QEMU_SITE = http://download.qemu.org
+QEMU_SITE = https://download.qemu.org
 QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
 QEMU_LICENSE_FILES = COPYING COPYING.LIB
 # NOTE: there is no top-level license file for non-(L)GPL licenses;
Signature · 6 lines
2.40.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  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
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot