* [Buildroot] [PATCH 04/16] support/testing: test_glxinfo: bump to kernel 4.19.204
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:02 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 05/16] support/testing: test_openrc: switch to ARM arm toolchain and builtin kernel Romain Naour
` (12 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The kernel 4.16.7 curently used by the test doesn't build with host
gcc >= 10 due the gcc default -fno-common. See GCC 10 porting guide [1].
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
Bump to the next LTS release.
[1] https://gcc.gnu.org/gcc-10/porting_to.html
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/package/test_glxinfo.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py
index 3417e48612..79be596635 100644
--- a/support/testing/tests/package/test_glxinfo.py
+++ b/support/testing/tests/package/test_glxinfo.py
@@ -20,7 +20,7 @@ class TestGlxinfo(infra.basetest.BRTest):
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"
+ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config"
BR2_PACKAGE_MESA3D_DEMOS=y
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* [Buildroot] [PATCH 05/16] support/testing: test_openrc: switch to ARM arm toolchain and builtin kernel
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
2021-09-12 14:11 ` [Buildroot] [PATCH 04/16] support/testing: test_glxinfo: " Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:02 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 06/16] support/testing: test_iso9660: bump to kernel 4.19.204 Romain Naour
` (11 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The kernel 5.5.7 curently used by the test doesn't build with host
gcc >= 10 due the gcc default -fno-common. See GCC 10 porting guide [1].
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
But we can't just update this test to the next linux kernel LTS 5.10.y since
the minimum gcc version has been updated to gcc 4.9 since 5.8 kernel [2]
and the Sourcery CodeBench ARM 2014.05 is used (gcc 4.8 based).
Enable arm cortex A9 and VFP support to switch to the ARM arm prebuilt
toolchain (the Bootlin toolchain could be used).
While at it use the prebuilt buildin kernel for the vexpress target
recently updated to 5.10.7.
Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/1564202094
[1] https://gcc.gnu.org/gcc-10/porting_to.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6ec4476ac82512f09c94aff5972654b70f3772b2
[3] 3cf2782906d5cc05a3966c25518d2ce01f11afc8
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/init/test_openrc.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/support/testing/tests/init/test_openrc.py b/support/testing/tests/init/test_openrc.py
index 14839434ef..c6ade7676d 100644
--- a/support/testing/tests/init/test_openrc.py
+++ b/support/testing/tests/init/test_openrc.py
@@ -5,15 +5,11 @@ class InitSystemOpenrcBase(InitSystemBase):
config = \
"""
BR2_arm=y
+ BR2_cortex_a9=y
+ BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_OPENRC=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
- BR2_LINUX_KERNEL=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.5.7"
- BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
- BR2_LINUX_KERNEL_DTS_SUPPORT=y
- BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
# BR2_TARGET_ROOTFS_TAR is not set
"""
@@ -34,7 +30,7 @@ class TestInitSystemOpenrcRoFull(InitSystemOpenrcBase):
"""
def test_run(self):
- self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9")
+ self.start_emulator("squashfs")
self.check_init()
@@ -46,5 +42,5 @@ class TestInitSystemOpenrcRwFull(InitSystemOpenrcBase):
"""
def test_run(self):
- self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9")
+ self.start_emulator("ext2")
self.check_init()
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* [Buildroot] [PATCH 06/16] support/testing: test_iso9660: bump to kernel 4.19.204
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
2021-09-12 14:11 ` [Buildroot] [PATCH 04/16] support/testing: test_glxinfo: " Romain Naour
2021-09-12 14:11 ` [Buildroot] [PATCH 05/16] support/testing: test_openrc: switch to ARM arm toolchain and builtin kernel Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:02 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 07/16] support/testing: test_lxc " Romain Naour
` (10 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The kernel 4.11 curently used by the test doesn't build with host
gcc >= 10 due the gcc default -fno-common. See GCC 10 porting guide [1].
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
Update to the latest 4.19 LTS version but doing so requires to
disable CONFIG_RETPOLINE since the toolchain is not retpoline
capable [2].
Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/1564202078
[1] https://gcc.gnu.org/gcc-10/porting_to.html
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8c4ad5d39144776c2987e81609204e1766ed4190
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/conf/minimal-x86-qemu-kernel.config | 1 +
support/testing/tests/fs/test_iso9660.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/support/testing/conf/minimal-x86-qemu-kernel.config b/support/testing/conf/minimal-x86-qemu-kernel.config
index cc8ee6a713..45994f804d 100644
--- a/support/testing/conf/minimal-x86-qemu-kernel.config
+++ b/support/testing/conf/minimal-x86-qemu-kernel.config
@@ -2,6 +2,7 @@ CONFIG_SYSVIPC=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_SMP=y
+# CONFIG_RETPOLINE is not set
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
CONFIG_NET=y
diff --git a/support/testing/tests/fs/test_iso9660.py b/support/testing/tests/fs/test_iso9660.py
index 68f4840852..412430318b 100644
--- a/support/testing/tests/fs/test_iso9660.py
+++ b/support/testing/tests/fs/test_iso9660.py
@@ -18,7 +18,7 @@ BASIC_CONFIG = \
BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
+ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}"
# BR2_TARGET_ROOTFS_TAR is not set
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* [Buildroot] [PATCH 07/16] support/testing: test_lxc bump to kernel 4.19.204
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (2 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 06/16] support/testing: test_iso9660: bump to kernel 4.19.204 Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:03 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 08/16] support/testing: test_rust: remove kernel build Romain Naour
` (9 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The kernel 4.19.79 curently used by the test doesn't build with host
gcc >= 10 due the gcc default -fno-common. See GCC 10 porting guide [1].
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
The issue was fixed in 4.19.114 [2]
Bump to the latest 4.19.x version.
[1] https://gcc.gnu.org/gcc-10/porting_to.html
[2] http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/package/test_lxc.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/testing/tests/package/test_lxc.py b/support/testing/tests/package/test_lxc.py
index b32b7a20c4..d98bed8761 100644
--- a/support/testing/tests/package/test_lxc.py
+++ b/support/testing/tests/package/test_lxc.py
@@ -12,7 +12,7 @@ class TestLxc(infra.basetest.BRTest):
BR2_TOOLCHAIN_EXTERNAL=y
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.79"
+ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204"
BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* [Buildroot] [PATCH 08/16] support/testing: test_rust: remove kernel build
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (3 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 07/16] support/testing: test_lxc " Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:03 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain Romain Naour
` (8 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
This test already use builtin kernel provided by the testsuite infra:
self.emulator.boot(arch="armv7",
kernel="builtin",
options=["-initrd", img])
But a second kernel is build from the its defconfig. This second kernel
is not used by the test.
The TestRust (using BR2_PACKAGE_HOST_RUST=y) is really long to build,
same some cpu time by removing the kernel build.
This unused kernel (based on 4.11.3 release) don't even build with host
gcc >= 10.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/package/test_rust.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py
index cd5dccf8e1..884b40a4a3 100644
--- a/support/testing/tests/package/test_rust.py
+++ b/support/testing/tests/package/test_rust.py
@@ -65,12 +65,6 @@ class TestRustBin(TestRustBase):
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
BR2_SYSTEM_DHCP="eth0"
- BR2_LINUX_KERNEL=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
- BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
- BR2_LINUX_KERNEL_DTS_SUPPORT=y
- BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
BR2_TARGET_ROOTFS_CPIO=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_RUSTC=y
@@ -92,12 +86,6 @@ class TestRust(TestRustBase):
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
BR2_SYSTEM_DHCP="eth0"
- BR2_LINUX_KERNEL=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION=y
- BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
- BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
- BR2_LINUX_KERNEL_DTS_SUPPORT=y
- BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
BR2_TARGET_ROOTFS_CPIO=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_PACKAGE_HOST_RUSTC=y
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 08/16] support/testing: test_rust: remove kernel build
2021-09-12 14:11 ` [Buildroot] [PATCH 08/16] support/testing: test_rust: remove kernel build Romain Naour
@ 2021-10-04 20:03 ` Peter Korsgaard
0 siblings, 0 replies; 43+ messages in thread
From: Peter Korsgaard @ 2021-10-04 20:03 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> This test already use builtin kernel provided by the testsuite infra:
> self.emulator.boot(arch="armv7",
> kernel="builtin",
> options=["-initrd", img])
> But a second kernel is build from the its defconfig. This second kernel
> is not used by the test.
> The TestRust (using BR2_PACKAGE_HOST_RUST=y) is really long to build,
> same some cpu time by removing the kernel build.
> This unused kernel (based on 4.11.3 release) don't even build with host
> gcc >= 10.
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (4 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 08/16] support/testing: test_rust: remove kernel build Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:06 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 10/16] support/testing: switch to prebuilt toolchain, core2duo to Nehalem Romain Naour
` (7 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Switch from the Buildroot internal toolchain for armv5 to
the prebuilt Bootlin external toolchain.
The test doesn't require to build a toolchain, there was
no prebuilt glibc toolchain recent enough at the time this
test has been introduced.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/package/test_openssh.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/support/testing/tests/package/test_openssh.py b/support/testing/tests/package/test_openssh.py
index 490147f86f..4b48059573 100644
--- a/support/testing/tests/package/test_openssh.py
+++ b/support/testing/tests/package/test_openssh.py
@@ -47,9 +47,8 @@ class TestOpenSshGlibc(TestOpensshBase):
TestOpensshBase.opensshconfig + \
"""
BR2_arm=y
- BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
- BR2_KERNEL_HEADERS_4_19=y
- BR2_TOOLCHAIN_BUILDROOT_CXX=y
+ BR2_TOOLCHAIN_EXTERNAL=y
+ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
BR2_PACKAGE_RNG_TOOLS=y
BR2_TARGET_ROOTFS_CPIO=y
"""
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain
2021-09-12 14:11 ` [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain Romain Naour
@ 2021-10-04 20:06 ` Peter Korsgaard
2021-11-14 17:20 ` Romain Naour
0 siblings, 1 reply; 43+ messages in thread
From: Peter Korsgaard @ 2021-10-04 20:06 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> Switch from the Buildroot internal toolchain for armv5 to
> the prebuilt Bootlin external toolchain.
> The test doesn't require to build a toolchain, there was
> no prebuilt glibc toolchain recent enough at the time this
> test has been introduced.
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain
2021-10-04 20:06 ` Peter Korsgaard
@ 2021-11-14 17:20 ` Romain Naour
0 siblings, 0 replies; 43+ messages in thread
From: Romain Naour @ 2021-11-14 17:20 UTC (permalink / raw)
To: Peter Korsgaard; +Cc: buildroot
Hello Peter,
Le 04/10/2021 à 22:06, Peter Korsgaard a écrit :
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
>
> > Switch from the Buildroot internal toolchain for armv5 to
> > the prebuilt Bootlin external toolchain.
>
> > The test doesn't require to build a toolchain, there was
> > no prebuilt glibc toolchain recent enough at the time this
> > test has been introduced.
>
> > Signed-off-by: Romain Naour <romain.naour@gmail.com>
>
> Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
>
For 2021.02.x the Bootlin toolchain bleeding-edge use kernel-headers too new
(5.4) for the 4.19 kernel used by this test.
The kernel doesn't boot with "kernel too old" message.
Best regards,
Romain
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* [Buildroot] [PATCH 10/16] support/testing: switch to prebuilt toolchain, core2duo to Nehalem
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (5 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 09/16] support/testing: test_openssh: use a prebuilt toolchain Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-04 20:09 ` Peter Korsgaard
2021-09-12 14:11 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Romain Naour
` (6 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
To avoid spending some time to build the x86_64 toolchain (~20min),
switch to corei7 cpu (Nahalem) and use the prebuilt Bootlin toolchain.
We have to use the "stable" Bootlin toolchain to use the same kernel version
for the toolchain kernel headers and the running kernel.
With the "bleeding-edge" toolchain we have the "kernel too old" issue
(running kernel 4.19 vs kernel headers 5.4)
Runtime tested locally.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
---
support/testing/tests/package/test_docker_compose.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py
index 35e659a74d..1ce132c242 100644
--- a/support/testing/tests/package/test_docker_compose.py
+++ b/support/testing/tests/package/test_docker_compose.py
@@ -7,10 +7,9 @@ class TestDockerCompose(infra.basetest.BRTest):
config = \
"""
BR2_x86_64=y
- BR2_x86_core2=y
- BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
- BR2_KERNEL_HEADERS_4_19=y
- BR2_TOOLCHAIN_BUILDROOT_CXX=y
+ BR2_x86_corei7=y
+ BR2_TOOLCHAIN_EXTERNAL=y
+ BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_POST_BUILD_SCRIPT="{}"
BR2_ROOTFS_POST_SCRIPT_ARGS="{}"
@@ -53,7 +52,7 @@ class TestDockerCompose(infra.basetest.BRTest):
self.emulator.boot(arch="x86_64",
kernel=kernel,
kernel_cmdline=["root=/dev/vda", "console=ttyS0"],
- options=["-cpu", "core2duo",
+ options=["-cpu", "Nehalem",
"-m", "512M",
"-device", "virtio-rng-pci",
"-drive", "file={},format=raw,if=virtio".format(rootfs),
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 10/16] support/testing: switch to prebuilt toolchain, core2duo to Nehalem
2021-09-12 14:11 ` [Buildroot] [PATCH 10/16] support/testing: switch to prebuilt toolchain, core2duo to Nehalem Romain Naour
@ 2021-10-04 20:09 ` Peter Korsgaard
0 siblings, 0 replies; 43+ messages in thread
From: Peter Korsgaard @ 2021-10-04 20:09 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> To avoid spending some time to build the x86_64 toolchain (~20min),
> switch to corei7 cpu (Nahalem) and use the prebuilt Bootlin toolchain.
> We have to use the "stable" Bootlin toolchain to use the same kernel version
> for the toolchain kernel headers and the running kernel.
> With the "bleeding-edge" toolchain we have the "kernel too old" issue
> (running kernel 4.19 vs kernel headers 5.4)
> Runtime tested locally.
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Peter Korsgaard <peter@korsgaard.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (6 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 10/16] support/testing: switch to prebuilt toolchain, core2duo to Nehalem Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-09-21 20:34 ` Arnout Vandecappelle
` (2 more replies)
2021-09-12 14:11 ` [Buildroot] [PATCH 12/16] package/qemu: bump to version 6.1.0 Romain Naour
` (5 subsequent siblings)
13 siblings, 3 replies; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Starting with Qemu 6.1.0, gcc 7.5 is needed to build.
Since we build host-qemu package for qemu defconfig, we have to
upgrade to (at least) Debian buster that provide gcc 8 as host compiler.
While testing this upgrate, the test_edk2 failed since it actually
requires Qemu >= 4.1.0 to support arm SBSA reference machine [1].
Debian Buster only provide Qemu 3.1.
Finally, upgrade to Debian bullseye but it requires some linux
kernel version bump in several defconfigs since host gcc is based
on gcc-10 [2].
Add explicitely python package in the Docker file to install python2
on the host.
[1] https://git.qemu.org/?p=qemu.git;a=commit;h=64580903c2b3aee08d74d64e6248a313b246cb69
[2] http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
The docker image must be rebuild and pushed to https://hub.docker.com/r/buildroot/base/
---
support/docker/Dockerfile | 4 +++-
support/docker/apt-sources.list | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index a9bacca3a0..795b26c276 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -6,7 +6,7 @@
# We use a specific tag for the base image *and* the corresponding date
# for the repository., so do not forget to update the apt-sources.list
# file that is shipped next to this Dockerfile.
-FROM debian:stretch-20171210
+FROM debian:bullseye-20210902
LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
vendor="Buildroot" \
@@ -36,6 +36,8 @@ RUN apt-get install -y --no-install-recommends \
libncurses5-dev \
locales \
mercurial \
+ python \
+ python-six \
python3 \
python3-flake8 \
python3-nose2 \
diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
index 789fb8fc17..0f872fd398 100644
--- a/support/docker/apt-sources.list
+++ b/support/docker/apt-sources.list
@@ -1,4 +1,4 @@
-# Latest just before 20171210T000000Z:
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20171209T224618Z/ stretch/updates main
+# Latest just before 20210817T000000Z:
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye
2021-09-12 14:11 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Romain Naour
@ 2021-09-21 20:34 ` Arnout Vandecappelle
2021-09-22 20:10 ` [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200 Arnout Vandecappelle (Essensium/Mind)
2021-09-22 20:13 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Arnout Vandecappelle
2 siblings, 0 replies; 43+ messages in thread
From: Arnout Vandecappelle @ 2021-09-21 20:34 UTC (permalink / raw)
To: Romain Naour, buildroot
I've applied patches 1-10 to master, thanks.
On 12/09/2021 16:11, Romain Naour wrote:
> Starting with Qemu 6.1.0, gcc 7.5 is needed to build.
> Since we build host-qemu package for qemu defconfig, we have to
> upgrade to (at least) Debian buster that provide gcc 8 as host compiler.
>
> While testing this upgrate, the test_edk2 failed since it actually
> requires Qemu >= 4.1.0 to support arm SBSA reference machine [1].
> Debian Buster only provide Qemu 3.1.
>
> Finally, upgrade to Debian bullseye but it requires some linux
> kernel version bump in several defconfigs since host gcc is based
> on gcc-10 [2].
>
> Add explicitely python package in the Docker file to install python2
> on the host.
Once we convert all our support infra to python3 [1], this should no longer be
needed, right?
I propose to just apply it without python2, and see if things keep on running.
If not, we can still either add python2, or (better) fix the remaining issues.
>
> [1] https://git.qemu.org/?p=qemu.git;a=commit;h=64580903c2b3aee08d74d64e6248a313b246cb69
> [2] http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> The docker image must be rebuild and pushed to https://hub.docker.com/r/buildroot/base/
And after that, gitlab-ci.yml has to be updated.
Regards,
Arnout
[1]
https://patchwork.ozlabs.org/project/buildroot/patch/20210915194839.22122-2-petr.vorel@gmail.com/
> ---
> support/docker/Dockerfile | 4 +++-
> support/docker/apt-sources.list | 8 ++++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
> index a9bacca3a0..795b26c276 100644
> --- a/support/docker/Dockerfile
> +++ b/support/docker/Dockerfile
> @@ -6,7 +6,7 @@
> # We use a specific tag for the base image *and* the corresponding date
> # for the repository., so do not forget to update the apt-sources.list
> # file that is shipped next to this Dockerfile.
> -FROM debian:stretch-20171210
> +FROM debian:bullseye-20210902
>
> LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
> vendor="Buildroot" \
> @@ -36,6 +36,8 @@ RUN apt-get install -y --no-install-recommends \
> libncurses5-dev \
> locales \
> mercurial \
> + python \
> + python-six \
> python3 \
> python3-flake8 \
> python3-nose2 \
> diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
> index 789fb8fc17..0f872fd398 100644
> --- a/support/docker/apt-sources.list
> +++ b/support/docker/apt-sources.list
> @@ -1,4 +1,4 @@
> -# Latest just before 20171210T000000Z:
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20171209T224618Z/ stretch/updates main
> +# Latest just before 20210817T000000Z:
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main
>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-12 14:11 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Romain Naour
2021-09-21 20:34 ` Arnout Vandecappelle
@ 2021-09-22 20:10 ` Arnout Vandecappelle (Essensium/Mind)
2021-09-22 21:45 ` Romain Naour
2021-10-17 17:05 ` Yann E. MORIN
2021-09-22 20:13 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Arnout Vandecappelle
2 siblings, 2 replies; 43+ messages in thread
From: Arnout Vandecappelle (Essensium/Mind) @ 2021-09-22 20:10 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Yann E . MORIN
Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
to be used in CI tests. In order to actually use this new docker image,
update .gitlab-ci.yml to point to the docker image that was created with
the updated Dockerfile.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf9f2dca6c..150b8eac1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
# Configuration for Gitlab-CI.
# Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
-image: buildroot/base:20200814.2228
+image: buildroot/base:20210922.2200
stages:
- generate-gitlab-ci
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-22 20:10 ` [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200 Arnout Vandecappelle (Essensium/Mind)
@ 2021-09-22 21:45 ` Romain Naour
2021-09-23 18:25 ` Arnout Vandecappelle
2021-10-17 17:05 ` Yann E. MORIN
1 sibling, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-22 21:45 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind), buildroot; +Cc: Yann E . MORIN
Hi Arnout,
Le 22/09/2021 à 22:10, Arnout Vandecappelle (Essensium/Mind) a écrit :
> Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
> to be used in CI tests. In order to actually use this new docker image,
> update .gitlab-ci.yml to point to the docker image that was created with
> the updated Dockerfile.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
There are some new issues since last time I tested:
Without python installed, syslinux doesn't build.
TestSysLinuxX86EFI/build/syslinux-6.03/com32/cmenu/menugen.py [...]
make[6]: python: No such file or directory
https://gitlab.com/kubu93/buildroot/-/jobs/1614446766
There is a new issue with python-attrs test when python2 is not installed:
https://gitlab.com/kubu93/buildroot/-/jobs/1614446943
https://gitlab.com/kubu93/buildroot/-/jobs/1614446939
Strange python issue with refpolicy-2.20210908 build:
https://gitlab.com/kubu93/buildroot/-/jobs/1614446826/
But the issue I had with TestCheckPackage is fixed with the recent switch to
python3.
https://gitlab.com/kubu93/buildroot/-/jobs/1614447236
With all issues fixed:
Acked-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Best regards,
Romain
> ---
> .gitlab-ci.yml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index bf9f2dca6c..150b8eac1a 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,7 +1,7 @@
> # Configuration for Gitlab-CI.
> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>
> -image: buildroot/base:20200814.2228
> +image: buildroot/base:20210922.2200
>
> stages:
> - generate-gitlab-ci
>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-22 21:45 ` Romain Naour
@ 2021-09-23 18:25 ` Arnout Vandecappelle
2021-09-23 20:52 ` Romain Naour
0 siblings, 1 reply; 43+ messages in thread
From: Arnout Vandecappelle @ 2021-09-23 18:25 UTC (permalink / raw)
To: Romain Naour, buildroot; +Cc: Yann E . MORIN
On 22/09/2021 23:45, Romain Naour wrote:
> Hi Arnout,
>
> Le 22/09/2021 à 22:10, Arnout Vandecappelle (Essensium/Mind) a écrit :
>> Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
>> to be used in CI tests. In order to actually use this new docker image,
>> update .gitlab-ci.yml to point to the docker image that was created with
>> the updated Dockerfile.
>>
>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>
> There are some new issues since last time I tested:
>
> Without python installed, syslinux doesn't build.
>
> TestSysLinuxX86EFI/build/syslinux-6.03/com32/cmenu/menugen.py [...]
> make[6]: python: No such file or directory
>
> https://gitlab.com/kubu93/buildroot/-/jobs/1614446766
For that, we just need the python-is-python3 package (or whatever it's
called). Or, better yet, let syslinux depend on host-python3.
> There is a new issue with python-attrs test when python2 is not installed:
> https://gitlab.com/kubu93/buildroot/-/jobs/1614446943
> https://gitlab.com/kubu93/buildroot/-/jobs/1614446939
I suspect that that's just because python-attrs no longer supports python2. It
happens on the autobuilders as well:
http://autobuild.buildroot.net/results/175/175c2dd82dd305ed88b4d1780bd8c52e4f651de5/
And I have the same failure when I build on my laptop, which does have python2
installed (though /usr/bin/python is python3).
> Strange python issue with refpolicy-2.20210908 build:
> https://gitlab.com/kubu93/buildroot/-/jobs/1614446826/
Are you sure it is related to python? I also get the same error when I build
it locally on my laptop.
Regards,
Arnout
>
>
> But the issue I had with TestCheckPackage is fixed with the recent switch to
> python3.
>
> https://gitlab.com/kubu93/buildroot/-/jobs/1614447236
>
> With all issues fixed:
> Acked-by: Romain Naour <romain.naour@gmail.com>
> Tested-by: Romain Naour <romain.naour@gmail.com>
>
> Best regards,
> Romain
>
>> ---
>> .gitlab-ci.yml | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index bf9f2dca6c..150b8eac1a 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -1,7 +1,7 @@
>> # Configuration for Gitlab-CI.
>> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>>
>> -image: buildroot/base:20200814.2228
>> +image: buildroot/base:20210922.2200
>>
>> stages:
>> - generate-gitlab-ci
>>
>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-23 18:25 ` Arnout Vandecappelle
@ 2021-09-23 20:52 ` Romain Naour
2021-10-07 20:31 ` Romain Naour
0 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-23 20:52 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot; +Cc: Yann E . MORIN
Hello Arnout,
On 23/09/2021 20:25, Arnout Vandecappelle wrote:
>
>
> On 22/09/2021 23:45, Romain Naour wrote:
>> Hi Arnout,
>>
>> Le 22/09/2021 à 22:10, Arnout Vandecappelle (Essensium/Mind) a écrit :
>>> Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
>>> to be used in CI tests. In order to actually use this new docker image,
>>> update .gitlab-ci.yml to point to the docker image that was created with
>>> the updated Dockerfile.
>>>
>>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>>
>> There are some new issues since last time I tested:
>>
>> Without python installed, syslinux doesn't build.
>>
>> TestSysLinuxX86EFI/build/syslinux-6.03/com32/cmenu/menugen.py [...]
>> make[6]: python: No such file or directory
>>
>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446766
>
> For that, we just need the python-is-python3 package (or whatever it's called).
> Or, better yet, let syslinux depend on host-python3.
Actually python is not a mandatory dependency of Buildroot.
With python-is-python3 installed it doesn't fix the dependency issue for good.
It seems we can override the python interpreter:
https://repo.or.cz/syslinux.git/commitdiff/4dec62ce9c2c0d170f21b3ae2d7c618eb7a30c05
So we can force syslinux using the python3 interpreter provided by host-python3.
>
>
>> There is a new issue with python-attrs test when python2 is not installed:
>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446943
>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446939
>
> I suspect that that's just because python-attrs no longer supports python2. It
> happens on the autobuilders as well:
>
> http://autobuild.buildroot.net/results/175/175c2dd82dd305ed88b4d1780bd8c52e4f651de5/
>
It seems a fix is now available:
http://patchwork.ozlabs.org/project/buildroot/patch/20210923183751.361386-1-asafka7@gmail.com/
>
> And I have the same failure when I build on my laptop, which does have python2
> installed (though /usr/bin/python is python3).
>
>
>> Strange python issue with refpolicy-2.20210908 build:
>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446826/
>
> Are you sure it is related to python? I also get the same error when I build it
> locally on my laptop.
No, I reverted the last version bump of refpolicy and the test succeed.
It seems a refpolicy issue.
Best regards,
Romain
>
>
> Regards,
> Arnout
>
>>
>>
>> But the issue I had with TestCheckPackage is fixed with the recent switch to
>> python3.
>>
>> https://gitlab.com/kubu93/buildroot/-/jobs/1614447236
>>
>> With all issues fixed:
>> Acked-by: Romain Naour <romain.naour@gmail.com>
>> Tested-by: Romain Naour <romain.naour@gmail.com>
>>
>> Best regards,
>> Romain
>>
>>> ---
>>> .gitlab-ci.yml | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>> index bf9f2dca6c..150b8eac1a 100644
>>> --- a/.gitlab-ci.yml
>>> +++ b/.gitlab-ci.yml
>>> @@ -1,7 +1,7 @@
>>> # Configuration for Gitlab-CI.
>>> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>>> -image: buildroot/base:20200814.2228
>>> +image: buildroot/base:20210922.2200
>>> stages:
>>> - generate-gitlab-ci
>>>
>>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-23 20:52 ` Romain Naour
@ 2021-10-07 20:31 ` Romain Naour
0 siblings, 0 replies; 43+ messages in thread
From: Romain Naour @ 2021-10-07 20:31 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot; +Cc: Yann E . MORIN
Hello Arnout,
Le 23/09/2021 à 22:52, Romain Naour a écrit :
> Hello Arnout,
>
> On 23/09/2021 20:25, Arnout Vandecappelle wrote:
>>
>>
>> On 22/09/2021 23:45, Romain Naour wrote:
>>> Hi Arnout,
>>>
>>> Le 22/09/2021 à 22:10, Arnout Vandecappelle (Essensium/Mind) a écrit :
>>>> Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
>>>> to be used in CI tests. In order to actually use this new docker image,
>>>> update .gitlab-ci.yml to point to the docker image that was created with
>>>> the updated Dockerfile.
>>>>
>>>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>>>
>>> There are some new issues since last time I tested:
>>>
>>> Without python installed, syslinux doesn't build.
>>>
>>> TestSysLinuxX86EFI/build/syslinux-6.03/com32/cmenu/menugen.py [...]
>>> make[6]: python: No such file or directory
>>>
>>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446766
>>
>> For that, we just need the python-is-python3 package (or whatever it's called).
>> Or, better yet, let syslinux depend on host-python3.
>
> Actually python is not a mandatory dependency of Buildroot.
> With python-is-python3 installed it doesn't fix the dependency issue for good.
>
> It seems we can override the python interpreter:
> https://repo.or.cz/syslinux.git/commitdiff/4dec62ce9c2c0d170f21b3ae2d7c618eb7a30c05
>
> So we can force syslinux using the python3 interpreter provided by host-python3.
Fixed by:
https://git.buildroot.net/buildroot/commit/?id=6ccfd40711e122c720145044eb4d145a8bacd9db
>
>>
>>
>>> There is a new issue with python-attrs test when python2 is not installed:
>>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446943
>>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446939
>>
>> I suspect that that's just because python-attrs no longer supports python2. It
>> happens on the autobuilders as well:
>>
>> http://autobuild.buildroot.net/results/175/175c2dd82dd305ed88b4d1780bd8c52e4f651de5/
>>
>
> It seems a fix is now available:
> http://patchwork.ozlabs.org/project/buildroot/patch/20210923183751.361386-1-asafka7@gmail.com/
Fixed by:
https://git.buildroot.net/buildroot/commit/?id=ef5c8be25ab373866b5a92d3d9f31bf36b7a8abf
>
>>
>> And I have the same failure when I build on my laptop, which does have python2
>> installed (though /usr/bin/python is python3).
>>
>>
>>> Strange python issue with refpolicy-2.20210908 build:
>>> https://gitlab.com/kubu93/buildroot/-/jobs/1614446826/
>>
>> Are you sure it is related to python? I also get the same error when I build it
>> locally on my laptop.
>
> No, I reverted the last version bump of refpolicy and the test succeed.
> It seems a refpolicy issue.
Fixed by:
https://git.buildroot.net/buildroot/commit/?id=60f991e68cac30c3e9912e73258f7804e7021d5e
So all the runtest issues has been fixed.
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Before merging this patch we can merge the csky toolchain removal:
http://lists.busybox.net/pipermail/buildroot/2021-October/624866.html
Best regards,
Romain
>
> Best regards,
> Romain
>
>
>>
>>
>> Regards,
>> Arnout
>>
>>>
>>>
>>> But the issue I had with TestCheckPackage is fixed with the recent switch to
>>> python3.
>>>
>>> https://gitlab.com/kubu93/buildroot/-/jobs/1614447236
>>>
>>> With all issues fixed:
>>> Acked-by: Romain Naour <romain.naour@gmail.com>
>>> Tested-by: Romain Naour <romain.naour@gmail.com>
>>>
>>> Best regards,
>>> Romain
>>>
>>>> ---
>>>> .gitlab-ci.yml | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>>> index bf9f2dca6c..150b8eac1a 100644
>>>> --- a/.gitlab-ci.yml
>>>> +++ b/.gitlab-ci.yml
>>>> @@ -1,7 +1,7 @@
>>>> # Configuration for Gitlab-CI.
>>>> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>>>> -image: buildroot/base:20200814.2228
>>>> +image: buildroot/base:20210922.2200
>>>> stages:
>>>> - generate-gitlab-ci
>>>>
>>>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200
2021-09-22 20:10 ` [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200 Arnout Vandecappelle (Essensium/Mind)
2021-09-22 21:45 ` Romain Naour
@ 2021-10-17 17:05 ` Yann E. MORIN
1 sibling, 0 replies; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 17:05 UTC (permalink / raw)
To: Arnout Vandecappelle (Essensium/Mind); +Cc: Romain Naour, buildroot
Arnout, All,
On 2021-09-22 22:10 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly:
> Commit 71b83227128be62c169313e85bb8f339f977ad67 updated the Dockerfile
> to be used in CI tests. In order to actually use this new docker image,
> update .gitlab-ci.yml to point to the docker image that was created with
> the updated Dockerfile.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> .gitlab-ci.yml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index bf9f2dca6c..150b8eac1a 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,7 +1,7 @@
> # Configuration for Gitlab-CI.
> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>
> -image: buildroot/base:20200814.2228
> +image: buildroot/base:20210922.2200
>
> stages:
> - generate-gitlab-ci
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* Re: [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye
2021-09-12 14:11 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Romain Naour
2021-09-21 20:34 ` Arnout Vandecappelle
2021-09-22 20:10 ` [Buildroot] [PATCH] .gitlab-ci.yml: update docker image to 20210922.2200 Arnout Vandecappelle (Essensium/Mind)
@ 2021-09-22 20:13 ` Arnout Vandecappelle
2021-09-22 20:50 ` Romain Naour
2 siblings, 1 reply; 43+ messages in thread
From: Arnout Vandecappelle @ 2021-09-22 20:13 UTC (permalink / raw)
To: Romain Naour, buildroot
On 12/09/2021 16:11, Romain Naour wrote:
> Starting with Qemu 6.1.0, gcc 7.5 is needed to build.
> Since we build host-qemu package for qemu defconfig, we have to
> upgrade to (at least) Debian buster that provide gcc 8 as host compiler.
>
> While testing this upgrate, the test_edk2 failed since it actually
> requires Qemu >= 4.1.0 to support arm SBSA reference machine [1].
> Debian Buster only provide Qemu 3.1.
>
> Finally, upgrade to Debian bullseye but it requires some linux
> kernel version bump in several defconfigs since host gcc is based
> on gcc-10 [2].
>
> Add explicitely python package in the Docker file to install python2
> on the host.
>
> [1] https://git.qemu.org/?p=qemu.git;a=commit;h=64580903c2b3aee08d74d64e6248a313b246cb69
> [2] http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> ---
> The docker image must be rebuild and pushed to https://hub.docker.com/r/buildroot/base/
> ---
> support/docker/Dockerfile | 4 +++-
> support/docker/apt-sources.list | 8 ++++----
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
> index a9bacca3a0..795b26c276 100644
> --- a/support/docker/Dockerfile
> +++ b/support/docker/Dockerfile
> @@ -6,7 +6,7 @@
> # We use a specific tag for the base image *and* the corresponding date
> # for the repository., so do not forget to update the apt-sources.list
> # file that is shipped next to this Dockerfile.
> -FROM debian:stretch-20171210
> +FROM debian:bullseye-20210902
>
> LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
> vendor="Buildroot" \
> @@ -36,6 +36,8 @@ RUN apt-get install -y --no-install-recommends \
> libncurses5-dev \
> locales \
> mercurial \
> + python \
> + python-six \
As discussed, I applied to master without these python changes, pushed a new
docker image to dockerhub, and sent a patch that updates .gitlab-ci.yml.
I believe the rest of the series can only be applied after that update is
committed, right?
Regards,
Arnout
> python3 \
> python3-flake8 \
> python3-nose2 \
> diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
> index 789fb8fc17..0f872fd398 100644
> --- a/support/docker/apt-sources.list
> +++ b/support/docker/apt-sources.list
> @@ -1,4 +1,4 @@
> -# Latest just before 20171210T000000Z:
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
> -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20171209T224618Z/ stretch/updates main
> +# Latest just before 20210817T000000Z:
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20210902T193650Z/ bullseye-security main
> +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main
>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye
2021-09-22 20:13 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Arnout Vandecappelle
@ 2021-09-22 20:50 ` Romain Naour
0 siblings, 0 replies; 43+ messages in thread
From: Romain Naour @ 2021-09-22 20:50 UTC (permalink / raw)
To: Arnout Vandecappelle, buildroot
Hello Arnout,
Le 22/09/2021 à 22:13, Arnout Vandecappelle a écrit :
>
>
> On 12/09/2021 16:11, Romain Naour wrote:
>> Starting with Qemu 6.1.0, gcc 7.5 is needed to build.
>> Since we build host-qemu package for qemu defconfig, we have to
>> upgrade to (at least) Debian buster that provide gcc 8 as host compiler.
>>
>> While testing this upgrate, the test_edk2 failed since it actually
>> requires Qemu >= 4.1.0 to support arm SBSA reference machine [1].
>> Debian Buster only provide Qemu 3.1.
>>
>> Finally, upgrade to Debian bullseye but it requires some linux
>> kernel version bump in several defconfigs since host gcc is based
>> on gcc-10 [2].
>>
>> Add explicitely python package in the Docker file to install python2
>> on the host.
>>
>> [1]
>> https://git.qemu.org/?p=qemu.git;a=commit;h=64580903c2b3aee08d74d64e6248a313b246cb69
>>
>> [2]
>> http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
>>
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> The docker image must be rebuild and pushed to
>> https://hub.docker.com/r/buildroot/base/
>> ---
>> support/docker/Dockerfile | 4 +++-
>> support/docker/apt-sources.list | 8 ++++----
>> 2 files changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
>> index a9bacca3a0..795b26c276 100644
>> --- a/support/docker/Dockerfile
>> +++ b/support/docker/Dockerfile
>> @@ -6,7 +6,7 @@
>> # We use a specific tag for the base image *and* the corresponding date
>> # for the repository., so do not forget to update the apt-sources.list
>> # file that is shipped next to this Dockerfile.
>> -FROM debian:stretch-20171210
>> +FROM debian:bullseye-20210902
>> LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
>> vendor="Buildroot" \
>> @@ -36,6 +36,8 @@ RUN apt-get install -y --no-install-recommends \
>> libncurses5-dev \
>> locales \
>> mercurial \
>> + python \
>> + python-six \
>
> As discussed, I applied to master without these python changes, pushed a new
> docker image to dockerhub, and sent a patch that updates .gitlab-ci.yml.
Ok, great!
> I believe the rest of the series can only be applied after that update is
> committed, right?
Yes, we need to switch to this new Docker image before merging qemu update.
I tested the series using image stored in my dockerhub account.
But we can't avoid the ubifs regression in the testsuite...
Best regards,
Romain
>
> Regards,
> Arnout
>
>> python3 \
>> python3-flake8 \
>> python3-nose2 \
>> diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
>> index 789fb8fc17..0f872fd398 100644
>> --- a/support/docker/apt-sources.list
>> +++ b/support/docker/apt-sources.list
>> @@ -1,4 +1,4 @@
>> -# Latest just before 20171210T000000Z:
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian-security/20171209T224618Z/
>> stretch/updates main
>> +# Latest just before 20210817T000000Z:
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian-security/20210902T193650Z/
>> bullseye-security main
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main
>>
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread
* [Buildroot] [PATCH 12/16] package/qemu: bump to version 6.1.0
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (7 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-17 19:49 ` Yann E. MORIN
2021-09-12 14:11 ` [Buildroot] [PATCH 13/16] support/testing: test_ubi: reduce the rootfs.ubi size to 64M to match the Qemu emulated flash device Romain Naour
` (4 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Remove upstream patches.
Drop 0003-meson-add-tests-option.patch and disable the fp-bench build by default [1]
Qemu now requires at least gcc 7.x to build.
Disable optional dependency for eBPF RSS loader.
See:
https://wiki.qemu.org/ChangeLog/6.1#Build_Information
[1] https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
This version bump will break test_ubi since it requires qemu 2.8.0 to pass (due to a qemu bug).
The test will be updated/fixed in the follow-up commits.
---
.../0002-Fix-build-with-64-bits-time_t.patch | 98 -------------------
...fp-disable-fp-bench-build-by-default.patch | 28 ++++++
....c-fix-fuse-lseek-on-uclibc-or-musl.patch} | 0
.../qemu/0003-meson-add-tests-option.patch | 94 ------------------
.../0004-Makefile-ignore-long-options.patch | 41 --------
...5-block-export-fuse.c-fix-musl-build.patch | 46 ---------
package/qemu/Config.in | 6 +-
package/qemu/Config.in.host | 5 +-
package/qemu/qemu.hash | 2 +-
package/qemu/qemu.mk | 6 +-
10 files changed, 37 insertions(+), 289 deletions(-)
delete mode 100644 package/qemu/0002-Fix-build-with-64-bits-time_t.patch
create mode 100644 package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
rename package/qemu/{0006-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch => 0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch} (100%)
delete mode 100644 package/qemu/0003-meson-add-tests-option.patch
delete mode 100644 package/qemu/0004-Makefile-ignore-long-options.patch
delete mode 100644 package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
diff --git a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch
deleted file mode 100644
index 934c0e28fd..0000000000
--- a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 839e51aa452345b440f8d2d0df84ab58bdedfcd1 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 14 Nov 2020 21:54:17 +0100
-Subject: [PATCH] Fix build with 64 bits time_t
-
-time element is deprecated on new input_event structure in kernel's
-input.h [1]
-
-This will avoid the following build failure:
-
-hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status':
-hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time'
- 198 | if (gettimeofday(&evdev.time, NULL)) {
- | ^
-
-Fixes:
- - http://autobuild.buildroot.org/results/a538167e288c14208d557cd45446df86d3d599d5
- - http://autobuild.buildroot.org/results/efd4474fb4b6c0ce0ab3838ce130429c51e43bbb
-
-[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- contrib/vhost-user-input/main.c | 10 +++++++++-
- hw/input/virtio-input-host.c | 10 +++++++++-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
-index 6020c6f33a..e688c3e0a9 100644
---- a/contrib/vhost-user-input/main.c
-+++ b/contrib/vhost-user-input/main.c
-@@ -15,6 +15,11 @@
- #include "standard-headers/linux/virtio_input.h"
- #include "qapi/error.h"
-
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- enum {
- VHOST_USER_INPUT_MAX_QUEUES = 2,
- };
-@@ -113,13 +118,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
- static void vi_handle_status(VuInput *vi, virtio_input_event *event)
- {
- struct input_event evdev;
-+ struct timeval tval;
- int rc;
-
-- if (gettimeofday(&evdev.time, NULL)) {
-+ if (gettimeofday(&tval, NULL)) {
- perror("vi_handle_status: gettimeofday");
- return;
- }
-
-+ evdev.input_event_sec = tval.tv_sec;
-+ evdev.input_event_usec = tval.tv_usec;
- evdev.type = le16toh(event->type);
- evdev.code = le16toh(event->code);
- evdev.value = le32toh(event->value);
-diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
-index 85daf73f1a..2e261737e1 100644
---- a/hw/input/virtio-input-host.c
-+++ b/hw/input/virtio-input-host.c
-@@ -16,6 +16,11 @@
- #include <sys/ioctl.h>
- #include "standard-headers/linux/input.h"
-
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- /* ----------------------------------------------------------------- */
-
- static struct virtio_input_config virtio_input_host_config[] = {
-@@ -193,13 +198,16 @@ static void virtio_input_host_handle_status(VirtIOInput *vinput,
- {
- VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput);
- struct input_event evdev;
-+ struct timeval tval;
- int rc;
-
-- if (gettimeofday(&evdev.time, NULL)) {
-+ if (gettimeofday(&tval, NULL)) {
- perror("virtio_input_host_handle_status: gettimeofday");
- return;
- }
-
-+ evdev.input_event_sec = tval.tv_sec;
-+ evdev.input_event_usec = tval.tv_usec;
- evdev.type = le16_to_cpu(event->type);
- evdev.code = le16_to_cpu(event->code);
- evdev.value = le32_to_cpu(event->value);
---
-2.29.2
-
diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
new file mode 100644
index 0000000000..9bc8d43d59
--- /dev/null
+++ b/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
@@ -0,0 +1,28 @@
+From f82238299d3c4cd23ca60cfc0cf4271f5c860873 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 25 Aug 2021 21:55:53 +0200
+Subject: [PATCH] tests/fp: disable fp-bench build by default
+
+Fixes:
+https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ tests/fp/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/fp/meson.build b/tests/fp/meson.build
+index 07e2cdc8d2..c96460b7f1 100644
+--- a/tests/fp/meson.build
++++ b/tests/fp/meson.build
+@@ -631,6 +631,7 @@ fpbench = executable(
+ dependencies: [qemuutil],
+ include_directories: [sfinc, include_directories(tfdir)],
+ c_args: fpcflags,
++ build_by_default: false,
+ )
+
+ fptestlog2 = executable(
+--
+2.31.1
+
diff --git a/package/qemu/0006-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
similarity index 100%
rename from package/qemu/0006-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
rename to package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
diff --git a/package/qemu/0003-meson-add-tests-option.patch b/package/qemu/0003-meson-add-tests-option.patch
deleted file mode 100644
index b52a7aaf2f..0000000000
--- a/package/qemu/0003-meson-add-tests-option.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From c24f6cc8f847a4f90cd8fe0f94604862c5ac4a5e Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Mon, 21 Dec 2020 22:12:14 +0100
-Subject: [PATCH] meson: add tests option
-
-tests/fp/fp-bench.c use fenv.h that is not always provided
-by the libc (uClibc).
-
-To workaround this issue, add an new meson option to
-disable tests while building Qemu.
-
-Fixes:
-http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
-Refresh for 6.0.0
----
- configure | 7 +++++++
- meson.build | 5 ++++-
- meson_options.txt | 2 ++
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 18c26e0389..7cceae4418 100755
---- a/configure
-+++ b/configure
-@@ -460,6 +460,7 @@ meson=""
- ninja=""
- skip_meson=no
- gettext="auto"
-+tests="auto"
- fuse="auto"
- fuse_lseek="auto"
- multiprocess="auto"
-@@ -1549,6 +1550,10 @@ for opt do
- ;;
- --disable-libdaxctl) libdaxctl=no
- ;;
-+ --disable-tests) tests="disabled"
-+ ;;
-+ --enable-tests) tests="enabled"
-+ ;;
- --enable-fuse) fuse="enabled"
- ;;
- --disable-fuse) fuse="disabled"
-@@ -1915,6 +1920,7 @@ disabled with --disable-FEATURE, default is enabled if available
- xkbcommon xkbcommon support
- rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
- libdaxctl libdaxctl support
-+ tests build tests
- fuse FUSE block device export
- fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports
- multiprocess Out of process device emulation support
-@@ -6422,6 +6428,7 @@ NINJA=$ninja $meson setup \
- -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
- -Dattr=$attr -Ddefault_devices=$default_devices \
- -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
-+ -Dtests=$tests \
- -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \
- -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \
- $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
-diff --git a/meson.build b/meson.build
-index e3386196ba..7f4efdc347 100644
---- a/meson.build
-+++ b/meson.build
-@@ -2381,7 +2381,10 @@ subdir('scripts')
- subdir('tools')
- subdir('pc-bios')
- subdir('docs')
--subdir('tests')
-+if get_option('tests').enabled()
-+ subdir('tests')
-+endif
-+
- if gtk.found()
- subdir('po')
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index f6f64785fe..81bffbfe87 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -111,6 +111,8 @@ option('fuse_lseek', type : 'feature', value : 'auto',
-
- option('vhost_user_blk_server', type: 'feature', value: 'auto',
- description: 'build vhost-user-blk server')
-+option('tests', type : 'feature', value : 'auto',
-+ description: 'Tests build support')
- option('virtfs', type: 'feature', value: 'auto',
- description: 'virtio-9p support')
- option('virtiofsd', type: 'feature', value: 'auto',
---
-2.29.2
-
diff --git a/package/qemu/0004-Makefile-ignore-long-options.patch b/package/qemu/0004-Makefile-ignore-long-options.patch
deleted file mode 100644
index 2d14b70c03..0000000000
--- a/package/qemu/0004-Makefile-ignore-long-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 14833e24dea49303ebc2464813601054b6cdfcac Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 21 Jul 2021 19:08:46 -0700
-Subject: [PATCH] Makefile: ignore long options
-
-When searching for options like -n in MAKEFLAGS, current code may result
-in a false positive match when make is invoked with long options like
---no-print-directory. This has been observed with certain versions of
-host make (e.g. 3.82) while building the Qemu package in buildroot.
-
-Filter out such long options before searching for one-character options.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
-Message-Id: <20210722020846.3678817-1-stilor@att.net>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- Makefile | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6c36330eef..401c623a65 100644
---- a/Makefile
-+++ b/Makefile
-@@ -129,9 +129,11 @@ endif
- # 4. Rules to bridge to other makefiles
-
- ifneq ($(NINJA),)
--MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS)))
--MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS)))
--MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS)))
-+# Filter out long options to avoid flags like --no-print-directory which
-+# may result in false positive match for MAKE.n
-+MAKE.n = $(findstring n,$(firstword $(filter-out --%,$(MAKEFLAGS))))
-+MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
-+MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
- MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
- NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
- $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
---
-2.27.0
-
diff --git a/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
deleted file mode 100644
index 0da6b3ff73..0000000000
--- a/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4d5280c066eb46a31556044fb52c2618928b0019 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 9 Aug 2021 10:04:07 +0200
-Subject: [PATCH] block/export/fuse.c: fix musl build
-
-Fix the following build failure on musl raised since version 6.0.0 and
-https://gitlab.com/qemu-project/qemu/-/commit/4ca37a96a75aafe7a37ba51ab1912b09b7190a6b
-because musl does not define FALLOC_FL_ZERO_RANGE:
-
-../block/export/fuse.c: In function 'fuse_fallocate':
-../block/export/fuse.c:563:23: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
- 563 | } else if (mode & FALLOC_FL_ZERO_RANGE) {
- | ^~~~~~~~~~~~~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/b96e3d364fd1f8bbfb18904a742e73327d308f64
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: sent to qemu-devel@nongnu.org]
----
- block/export/fuse.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/block/export/fuse.c b/block/export/fuse.c
-index ada9e263eb..07e31129a6 100644
---- a/block/export/fuse.c
-+++ b/block/export/fuse.c
-@@ -635,6 +635,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
- offset += size;
- length -= size;
- } while (ret == 0 && length > 0);
-+#ifdef FALLOC_FL_ZERO_RANGE
- } else if (mode & FALLOC_FL_ZERO_RANGE) {
- if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {
- /* No need for zeroes, we are going to write them ourselves */
-@@ -654,6 +655,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
- offset += size;
- length -= size;
- } while (ret == 0 && length > 0);
-+#endif
- } else if (!mode) {
- /* We can only fallocate at the EOF with a truncate */
- if (offset < blk_len) {
---
-2.30.2
-
diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 391fd5faaf..763550dbd6 100644
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -5,14 +5,16 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
|| BR2_x86_64 || BR2_arm \
|| BR2_powerpc64 || BR2_powerpc64le
-comment "QEMU requires a toolchain with wchar, threads"
+comment "QEMU requires a toolchain with wchar, threads, gcc >= 7"
depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
depends on BR2_USE_MMU
- depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
+ depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_7
config BR2_PACKAGE_QEMU
bool "QEMU"
depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_WCHAR # gettext
depends on BR2_USE_MMU # fork()
diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
index fedf90d8b7..a5b38c081b 100644
--- a/package/qemu/Config.in.host
+++ b/package/qemu/Config.in.host
@@ -37,6 +37,7 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
config BR2_PACKAGE_HOST_QEMU
bool "host qemu"
depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
+ depends on BR2_HOST_GCC_AT_LEAST_7
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
select BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE \
@@ -93,11 +94,7 @@ config BR2_PACKAGE_HOST_QEMU_VIRTFS
config BR2_PACKAGE_HOST_QEMU_USB
bool "USB passthrough support"
- depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb
help
Enables USB passthrough support from guest to host.
-comment "USB passthrough support needs a toolchain w/ host gcc >= 4.9"
- depends on !BR2_HOST_GCC_AT_LEAST_4_9
-
endif
diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
index 5e873791b8..0613fce493 100644
--- a/package/qemu/qemu.hash
+++ b/package/qemu/qemu.hash
@@ -1,4 +1,4 @@
# Locally computed, tarball verified with GPG signature
-sha256 87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9 qemu-6.0.0.tar.xz
+sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz
sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 520618cd55..95f3dfe54f 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -4,7 +4,7 @@
#
################################################################################
-QEMU_VERSION = 6.0.0
+QEMU_VERSION = 6.1.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
@@ -186,6 +186,7 @@ define QEMU_CONFIGURE_CMDS
--enable-kvm \
--enable-attr \
--enable-vhost-net \
+ --disable-bpf \
--disable-bsd-user \
--disable-containers \
--disable-xen \
@@ -215,7 +216,6 @@ define QEMU_CONFIGURE_CMDS
--disable-opengl \
--disable-vhost-user-blk-server \
--disable-virtiofsd \
- --disable-tests \
$(QEMU_OPTS)
endef
@@ -351,6 +351,7 @@ define HOST_QEMU_CONFIGURE_CMDS
--extra-ldflags="$(HOST_LDFLAGS)" \
--meson=$(HOST_DIR)/bin/meson \
--ninja=$(HOST_DIR)/bin/ninja \
+ --disable-bpf \
--disable-bzip2 \
--disable-containers \
--disable-curl \
@@ -362,7 +363,6 @@ define HOST_QEMU_CONFIGURE_CMDS
--disable-vnc-jpeg \
--disable-vnc-png \
--disable-vnc-sasl \
- --disable-tests \
$(HOST_QEMU_OPTS)
endef
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 12/16] package/qemu: bump to version 6.1.0
2021-09-12 14:11 ` [Buildroot] [PATCH 12/16] package/qemu: bump to version 6.1.0 Romain Naour
@ 2021-10-17 19:49 ` Yann E. MORIN
0 siblings, 0 replies; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 19:49 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
Romain, All,
On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
> Remove upstream patches.
> Drop 0003-meson-add-tests-option.patch and disable the fp-bench build by default [1]
>
> Qemu now requires at least gcc 7.x to build.
>
> Disable optional dependency for eBPF RSS loader.
>
> See:
> https://wiki.qemu.org/ChangeLog/6.1#Build_Information
>
> [1] https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> This version bump will break test_ubi since it requires qemu 2.8.0 to pass (due to a qemu bug).
> The test will be updated/fixed in the follow-up commits.
> ---
> .../0002-Fix-build-with-64-bits-time_t.patch | 98 -------------------
> ...fp-disable-fp-bench-build-by-default.patch | 28 ++++++
> ....c-fix-fuse-lseek-on-uclibc-or-musl.patch} | 0
> .../qemu/0003-meson-add-tests-option.patch | 94 ------------------
> .../0004-Makefile-ignore-long-options.patch | 41 --------
> ...5-block-export-fuse.c-fix-musl-build.patch | 46 ---------
> package/qemu/Config.in | 6 +-
> package/qemu/Config.in.host | 5 +-
> package/qemu/qemu.hash | 2 +-
> package/qemu/qemu.mk | 6 +-
> 10 files changed, 37 insertions(+), 289 deletions(-)
> delete mode 100644 package/qemu/0002-Fix-build-with-64-bits-time_t.patch
> create mode 100644 package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
> rename package/qemu/{0006-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch => 0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch} (100%)
> delete mode 100644 package/qemu/0003-meson-add-tests-option.patch
> delete mode 100644 package/qemu/0004-Makefile-ignore-long-options.patch
> delete mode 100644 package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
>
> diff --git a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch b/package/qemu/0002-Fix-build-with-64-bits-time_t.patch
> deleted file mode 100644
> index 934c0e28fd..0000000000
> --- a/package/qemu/0002-Fix-build-with-64-bits-time_t.patch
> +++ /dev/null
> @@ -1,98 +0,0 @@
> -From 839e51aa452345b440f8d2d0df84ab58bdedfcd1 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sat, 14 Nov 2020 21:54:17 +0100
> -Subject: [PATCH] Fix build with 64 bits time_t
> -
> -time element is deprecated on new input_event structure in kernel's
> -input.h [1]
> -
> -This will avoid the following build failure:
> -
> -hw/input/virtio-input-host.c: In function 'virtio_input_host_handle_status':
> -hw/input/virtio-input-host.c:198:28: error: 'struct input_event' has no member named 'time'
> - 198 | if (gettimeofday(&evdev.time, NULL)) {
> - | ^
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/a538167e288c14208d557cd45446df86d3d599d5
> - - http://autobuild.buildroot.org/results/efd4474fb4b6c0ce0ab3838ce130429c51e43bbb
> -
> -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ----
> - contrib/vhost-user-input/main.c | 10 +++++++++-
> - hw/input/virtio-input-host.c | 10 +++++++++-
> - 2 files changed, 18 insertions(+), 2 deletions(-)
> -
> -diff --git a/contrib/vhost-user-input/main.c b/contrib/vhost-user-input/main.c
> -index 6020c6f33a..e688c3e0a9 100644
> ---- a/contrib/vhost-user-input/main.c
> -+++ b/contrib/vhost-user-input/main.c
> -@@ -15,6 +15,11 @@
> - #include "standard-headers/linux/virtio_input.h"
> - #include "qapi/error.h"
> -
> -+#ifndef input_event_sec
> -+#define input_event_sec time.tv_sec
> -+#define input_event_usec time.tv_usec
> -+#endif
> -+
> - enum {
> - VHOST_USER_INPUT_MAX_QUEUES = 2,
> - };
> -@@ -113,13 +118,16 @@ vi_evdev_watch(VuDev *dev, int condition, void *data)
> - static void vi_handle_status(VuInput *vi, virtio_input_event *event)
> - {
> - struct input_event evdev;
> -+ struct timeval tval;
> - int rc;
> -
> -- if (gettimeofday(&evdev.time, NULL)) {
> -+ if (gettimeofday(&tval, NULL)) {
> - perror("vi_handle_status: gettimeofday");
> - return;
> - }
> -
> -+ evdev.input_event_sec = tval.tv_sec;
> -+ evdev.input_event_usec = tval.tv_usec;
> - evdev.type = le16toh(event->type);
> - evdev.code = le16toh(event->code);
> - evdev.value = le32toh(event->value);
> -diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
> -index 85daf73f1a..2e261737e1 100644
> ---- a/hw/input/virtio-input-host.c
> -+++ b/hw/input/virtio-input-host.c
> -@@ -16,6 +16,11 @@
> - #include <sys/ioctl.h>
> - #include "standard-headers/linux/input.h"
> -
> -+#ifndef input_event_sec
> -+#define input_event_sec time.tv_sec
> -+#define input_event_usec time.tv_usec
> -+#endif
> -+
> - /* ----------------------------------------------------------------- */
> -
> - static struct virtio_input_config virtio_input_host_config[] = {
> -@@ -193,13 +198,16 @@ static void virtio_input_host_handle_status(VirtIOInput *vinput,
> - {
> - VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput);
> - struct input_event evdev;
> -+ struct timeval tval;
> - int rc;
> -
> -- if (gettimeofday(&evdev.time, NULL)) {
> -+ if (gettimeofday(&tval, NULL)) {
> - perror("virtio_input_host_handle_status: gettimeofday");
> - return;
> - }
> -
> -+ evdev.input_event_sec = tval.tv_sec;
> -+ evdev.input_event_usec = tval.tv_usec;
> - evdev.type = le16_to_cpu(event->type);
> - evdev.code = le16_to_cpu(event->code);
> - evdev.value = le32_to_cpu(event->value);
> ---
> -2.29.2
> -
> diff --git a/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch b/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
> new file mode 100644
> index 0000000000..9bc8d43d59
> --- /dev/null
> +++ b/package/qemu/0002-tests-fp-disable-fp-bench-build-by-default.patch
> @@ -0,0 +1,28 @@
> +From f82238299d3c4cd23ca60cfc0cf4271f5c860873 Mon Sep 17 00:00:00 2001
> +From: Romain Naour <romain.naour@gmail.com>
> +Date: Wed, 25 Aug 2021 21:55:53 +0200
> +Subject: [PATCH] tests/fp: disable fp-bench build by default
> +
> +Fixes:
> +https://lists.nongnu.org/archive/html/qemu-devel/2021-03/msg00947.html
> +
> +Signed-off-by: Romain Naour <romain.naour@gmail.com>
> +---
> + tests/fp/meson.build | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/tests/fp/meson.build b/tests/fp/meson.build
> +index 07e2cdc8d2..c96460b7f1 100644
> +--- a/tests/fp/meson.build
> ++++ b/tests/fp/meson.build
> +@@ -631,6 +631,7 @@ fpbench = executable(
> + dependencies: [qemuutil],
> + include_directories: [sfinc, include_directories(tfdir)],
> + c_args: fpcflags,
> ++ build_by_default: false,
> + )
> +
> + fptestlog2 = executable(
> +--
> +2.31.1
> +
> diff --git a/package/qemu/0006-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
> similarity index 100%
> rename from package/qemu/0006-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
> rename to package/qemu/0003-block-export-fuse.c-fix-fuse-lseek-on-uclibc-or-musl.patch
> diff --git a/package/qemu/0003-meson-add-tests-option.patch b/package/qemu/0003-meson-add-tests-option.patch
> deleted file mode 100644
> index b52a7aaf2f..0000000000
> --- a/package/qemu/0003-meson-add-tests-option.patch
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -From c24f6cc8f847a4f90cd8fe0f94604862c5ac4a5e Mon Sep 17 00:00:00 2001
> -From: Romain Naour <romain.naour@gmail.com>
> -Date: Mon, 21 Dec 2020 22:12:14 +0100
> -Subject: [PATCH] meson: add tests option
> -
> -tests/fp/fp-bench.c use fenv.h that is not always provided
> -by the libc (uClibc).
> -
> -To workaround this issue, add an new meson option to
> -disable tests while building Qemu.
> -
> -Fixes:
> -http://autobuild.buildroot.net/results/53f5d8baa994d599b9da013ee643b82353366ec3/build-end.log
> -
> -Signed-off-by: Romain Naour <romain.naour@gmail.com>
> -Signed-off-by: Adam Duskett <aduskett@gmail.com>
> -Refresh for 6.0.0
> ----
> - configure | 7 +++++++
> - meson.build | 5 ++++-
> - meson_options.txt | 2 ++
> - 3 files changed, 13 insertions(+), 1 deletion(-)
> -
> -diff --git a/configure b/configure
> -index 18c26e0389..7cceae4418 100755
> ---- a/configure
> -+++ b/configure
> -@@ -460,6 +460,7 @@ meson=""
> - ninja=""
> - skip_meson=no
> - gettext="auto"
> -+tests="auto"
> - fuse="auto"
> - fuse_lseek="auto"
> - multiprocess="auto"
> -@@ -1549,6 +1550,10 @@ for opt do
> - ;;
> - --disable-libdaxctl) libdaxctl=no
> - ;;
> -+ --disable-tests) tests="disabled"
> -+ ;;
> -+ --enable-tests) tests="enabled"
> -+ ;;
> - --enable-fuse) fuse="enabled"
> - ;;
> - --disable-fuse) fuse="disabled"
> -@@ -1915,6 +1920,7 @@ disabled with --disable-FEATURE, default is enabled if available
> - xkbcommon xkbcommon support
> - rng-none dummy RNG, avoid using /dev/(u)random and getrandom()
> - libdaxctl libdaxctl support
> -+ tests build tests
> - fuse FUSE block device export
> - fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports
> - multiprocess Out of process device emulation support
> -@@ -6422,6 +6428,7 @@ NINJA=$ninja $meson setup \
> - -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
> - -Dattr=$attr -Ddefault_devices=$default_devices \
> - -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
> -+ -Dtests=$tests \
> - -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \
> - -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \
> - $(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
> -diff --git a/meson.build b/meson.build
> -index e3386196ba..7f4efdc347 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -2381,7 +2381,10 @@ subdir('scripts')
> - subdir('tools')
> - subdir('pc-bios')
> - subdir('docs')
> --subdir('tests')
> -+if get_option('tests').enabled()
> -+ subdir('tests')
> -+endif
> -+
> - if gtk.found()
> - subdir('po')
> - endif
> -diff --git a/meson_options.txt b/meson_options.txt
> -index f6f64785fe..81bffbfe87 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -111,6 +111,8 @@ option('fuse_lseek', type : 'feature', value : 'auto',
> -
> - option('vhost_user_blk_server', type: 'feature', value: 'auto',
> - description: 'build vhost-user-blk server')
> -+option('tests', type : 'feature', value : 'auto',
> -+ description: 'Tests build support')
> - option('virtfs', type: 'feature', value: 'auto',
> - description: 'virtio-9p support')
> - option('virtiofsd', type: 'feature', value: 'auto',
> ---
> -2.29.2
> -
> diff --git a/package/qemu/0004-Makefile-ignore-long-options.patch b/package/qemu/0004-Makefile-ignore-long-options.patch
> deleted file mode 100644
> index 2d14b70c03..0000000000
> --- a/package/qemu/0004-Makefile-ignore-long-options.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From 14833e24dea49303ebc2464813601054b6cdfcac Mon Sep 17 00:00:00 2001
> -From: Alexey Neyman <stilor@att.net>
> -Date: Wed, 21 Jul 2021 19:08:46 -0700
> -Subject: [PATCH] Makefile: ignore long options
> -
> -When searching for options like -n in MAKEFLAGS, current code may result
> -in a false positive match when make is invoked with long options like
> ---no-print-directory. This has been observed with certain versions of
> -host make (e.g. 3.82) while building the Qemu package in buildroot.
> -
> -Filter out such long options before searching for one-character options.
> -
> -Signed-off-by: Alexey Neyman <stilor@att.net>
> -Message-Id: <20210722020846.3678817-1-stilor@att.net>
> -Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ----
> - Makefile | 8 +++++---
> - 1 file changed, 5 insertions(+), 3 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 6c36330eef..401c623a65 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -129,9 +129,11 @@ endif
> - # 4. Rules to bridge to other makefiles
> -
> - ifneq ($(NINJA),)
> --MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS)))
> --MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS)))
> --MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS)))
> -+# Filter out long options to avoid flags like --no-print-directory which
> -+# may result in false positive match for MAKE.n
> -+MAKE.n = $(findstring n,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> -+MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> -+MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
> - MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
> - NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
> - $(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
> ---
> -2.27.0
> -
> diff --git a/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch b/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
> deleted file mode 100644
> index 0da6b3ff73..0000000000
> --- a/package/qemu/0005-block-export-fuse.c-fix-musl-build.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From 4d5280c066eb46a31556044fb52c2618928b0019 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Mon, 9 Aug 2021 10:04:07 +0200
> -Subject: [PATCH] block/export/fuse.c: fix musl build
> -
> -Fix the following build failure on musl raised since version 6.0.0 and
> -https://gitlab.com/qemu-project/qemu/-/commit/4ca37a96a75aafe7a37ba51ab1912b09b7190a6b
> -because musl does not define FALLOC_FL_ZERO_RANGE:
> -
> -../block/export/fuse.c: In function 'fuse_fallocate':
> -../block/export/fuse.c:563:23: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function)
> - 563 | } else if (mode & FALLOC_FL_ZERO_RANGE) {
> - | ^~~~~~~~~~~~~~~~~~~~
> -
> -Fixes:
> - - http://autobuild.buildroot.org/results/b96e3d364fd1f8bbfb18904a742e73327d308f64
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status: sent to qemu-devel@nongnu.org]
> ----
> - block/export/fuse.c | 2 ++
> - 1 file changed, 2 insertions(+)
> -
> -diff --git a/block/export/fuse.c b/block/export/fuse.c
> -index ada9e263eb..07e31129a6 100644
> ---- a/block/export/fuse.c
> -+++ b/block/export/fuse.c
> -@@ -635,6 +635,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
> - offset += size;
> - length -= size;
> - } while (ret == 0 && length > 0);
> -+#ifdef FALLOC_FL_ZERO_RANGE
> - } else if (mode & FALLOC_FL_ZERO_RANGE) {
> - if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {
> - /* No need for zeroes, we are going to write them ourselves */
> -@@ -654,6 +655,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode,
> - offset += size;
> - length -= size;
> - } while (ret == 0 && length > 0);
> -+#endif
> - } else if (!mode) {
> - /* We can only fallocate at the EOF with a truncate */
> - if (offset < blk_len) {
> ---
> -2.30.2
> -
> diff --git a/package/qemu/Config.in b/package/qemu/Config.in
> index 391fd5faaf..763550dbd6 100644
> --- a/package/qemu/Config.in
> +++ b/package/qemu/Config.in
> @@ -5,14 +5,16 @@ config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
> || BR2_x86_64 || BR2_arm \
> || BR2_powerpc64 || BR2_powerpc64le
>
> -comment "QEMU requires a toolchain with wchar, threads"
> +comment "QEMU requires a toolchain with wchar, threads, gcc >= 7"
> depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
> depends on BR2_USE_MMU
> - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
> + depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) || \
> + !BR2_TOOLCHAIN_GCC_AT_LEAST_7
>
> config BR2_PACKAGE_QEMU
> bool "QEMU"
> depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET
> + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
> depends on BR2_TOOLCHAIN_HAS_THREADS
> depends on BR2_USE_WCHAR # gettext
> depends on BR2_USE_MMU # fork()
> diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host
> index fedf90d8b7..a5b38c081b 100644
> --- a/package/qemu/Config.in.host
> +++ b/package/qemu/Config.in.host
> @@ -37,6 +37,7 @@ config BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
> config BR2_PACKAGE_HOST_QEMU
> bool "host qemu"
> depends on BR2_PACKAGE_HOST_QEMU_SYSTEM_ARCH_SUPPORTS || BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
> + depends on BR2_HOST_GCC_AT_LEAST_7
> select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
> if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE && BR2_PACKAGE_HOST_QEMU_USER_ARCH_SUPPORTS
> select BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE \
> @@ -93,11 +94,7 @@ config BR2_PACKAGE_HOST_QEMU_VIRTFS
>
> config BR2_PACKAGE_HOST_QEMU_USB
> bool "USB passthrough support"
> - depends on BR2_HOST_GCC_AT_LEAST_4_9 # host-libusb
> help
> Enables USB passthrough support from guest to host.
>
> -comment "USB passthrough support needs a toolchain w/ host gcc >= 4.9"
> - depends on !BR2_HOST_GCC_AT_LEAST_4_9
> -
> endif
> diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash
> index 5e873791b8..0613fce493 100644
> --- a/package/qemu/qemu.hash
> +++ b/package/qemu/qemu.hash
> @@ -1,4 +1,4 @@
> # Locally computed, tarball verified with GPG signature
> -sha256 87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9 qemu-6.0.0.tar.xz
> +sha256 eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 qemu-6.1.0.tar.xz
> sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING
> sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> index 520618cd55..95f3dfe54f 100644
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -QEMU_VERSION = 6.0.0
> +QEMU_VERSION = 6.1.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
> @@ -186,6 +186,7 @@ define QEMU_CONFIGURE_CMDS
> --enable-kvm \
> --enable-attr \
> --enable-vhost-net \
> + --disable-bpf \
> --disable-bsd-user \
> --disable-containers \
> --disable-xen \
> @@ -215,7 +216,6 @@ define QEMU_CONFIGURE_CMDS
> --disable-opengl \
> --disable-vhost-user-blk-server \
> --disable-virtiofsd \
> - --disable-tests \
> $(QEMU_OPTS)
> endef
>
> @@ -351,6 +351,7 @@ define HOST_QEMU_CONFIGURE_CMDS
> --extra-ldflags="$(HOST_LDFLAGS)" \
> --meson=$(HOST_DIR)/bin/meson \
> --ninja=$(HOST_DIR)/bin/ninja \
> + --disable-bpf \
> --disable-bzip2 \
> --disable-containers \
> --disable-curl \
> @@ -362,7 +363,6 @@ define HOST_QEMU_CONFIGURE_CMDS
> --disable-vnc-jpeg \
> --disable-vnc-png \
> --disable-vnc-sasl \
> - --disable-tests \
> $(HOST_QEMU_OPTS)
> endef
>
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* [Buildroot] [PATCH 13/16] support/testing: test_ubi: reduce the rootfs.ubi size to 64M to match the Qemu emulated flash device
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (8 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 12/16] package/qemu: bump to version 6.1.0 Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-17 19:49 ` Yann E. MORIN
2021-09-12 14:11 ` [Buildroot] [PATCH 14/16] support/testing: test_ubi: add image format on the qemu command line Romain Naour
` (3 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
The size of the cfi flash device emulated by Qemu is 64M not 128M [1].
Since Qemu >= 4.0, the size of the device must match the size of the block backend [2].
Fixes:
qemu-system-arm: device requires 67108864 bytes, block backend provides 134217728 bytes
[1] https://git.qemu.org/?p=qemu.git;a=blob;f=hw/arm/vexpress.c;h=58481c07629aedb09864dcc72757ff7947e733bb;hb=f9baca549e44791be0dd98de15add3d8452a8af0#l50
[2] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=06f1521795207359a395996c253c306f4ab7586e
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/fs/test_ubi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
index 7321f83da9..8148e5f336 100644
--- a/support/testing/tests/fs/test_ubi.py
+++ b/support/testing/tests/fs/test_ubi.py
@@ -25,7 +25,7 @@ class TestUbi(infra.basetest.BRTest):
out = out.splitlines()
self.assertIn("UBI image, version 1", out[0])
- subprocess.call(["truncate", "-s 128M", img])
+ subprocess.call(["truncate", "-s 64M", img])
self.emulator.boot(arch="armv7",
kernel="builtin",
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 13/16] support/testing: test_ubi: reduce the rootfs.ubi size to 64M to match the Qemu emulated flash device
2021-09-12 14:11 ` [Buildroot] [PATCH 13/16] support/testing: test_ubi: reduce the rootfs.ubi size to 64M to match the Qemu emulated flash device Romain Naour
@ 2021-10-17 19:49 ` Yann E. MORIN
0 siblings, 0 replies; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 19:49 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
Romain, All,
On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
> The size of the cfi flash device emulated by Qemu is 64M not 128M [1].
> Since Qemu >= 4.0, the size of the device must match the size of the block backend [2].
>
> Fixes:
>
> qemu-system-arm: device requires 67108864 bytes, block backend provides 134217728 bytes
>
> [1] https://git.qemu.org/?p=qemu.git;a=blob;f=hw/arm/vexpress.c;h=58481c07629aedb09864dcc72757ff7947e733bb;hb=f9baca549e44791be0dd98de15add3d8452a8af0#l50
> [2] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=06f1521795207359a395996c253c306f4ab7586e
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> support/testing/tests/fs/test_ubi.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
> index 7321f83da9..8148e5f336 100644
> --- a/support/testing/tests/fs/test_ubi.py
> +++ b/support/testing/tests/fs/test_ubi.py
> @@ -25,7 +25,7 @@ class TestUbi(infra.basetest.BRTest):
> out = out.splitlines()
> self.assertIn("UBI image, version 1", out[0])
>
> - subprocess.call(["truncate", "-s 128M", img])
> + subprocess.call(["truncate", "-s 64M", img])
>
> self.emulator.boot(arch="armv7",
> kernel="builtin",
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* [Buildroot] [PATCH 14/16] support/testing: test_ubi: add image format on the qemu command line
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (9 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 13/16] support/testing: test_ubi: reduce the rootfs.ubi size to 64M to match the Qemu emulated flash device Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-17 19:50 ` Yann E. MORIN
2021-09-12 14:11 ` [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9 Romain Naour
` (2 subsequent siblings)
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Adding the Image format on the Qemu command line avoid this warning:
"WARNING: Image format was not specified for 'output/TestUbi/images/rootfs.ubi' and probing guessed raw.
Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
Specify the 'raw' format explicitly to remove the restrictions."
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
support/testing/tests/fs/test_ubi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
index 8148e5f336..eeb55b1d59 100644
--- a/support/testing/tests/fs/test_ubi.py
+++ b/support/testing/tests/fs/test_ubi.py
@@ -32,7 +32,7 @@ class TestUbi(infra.basetest.BRTest):
kernel_cmdline=["root=ubi0:rootfs",
"ubi.mtd=0",
"rootfstype=ubifs"],
- options=["-drive", "file={},if=pflash".format(img)])
+ options=["-drive", "file={},if=pflash,format=raw".format(img)])
self.emulator.login()
cmd = "mount | grep 'ubi0:rootfs on / type ubifs'"
_, exit_code = self.emulator.run(cmd)
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 14/16] support/testing: test_ubi: add image format on the qemu command line
2021-09-12 14:11 ` [Buildroot] [PATCH 14/16] support/testing: test_ubi: add image format on the qemu command line Romain Naour
@ 2021-10-17 19:50 ` Yann E. MORIN
0 siblings, 0 replies; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 19:50 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
Romain, All,
On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
> Adding the Image format on the Qemu command line avoid this warning:
>
> "WARNING: Image format was not specified for 'output/TestUbi/images/rootfs.ubi' and probing guessed raw.
> Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
> Specify the 'raw' format explicitly to remove the restrictions."
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> support/testing/tests/fs/test_ubi.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
> index 8148e5f336..eeb55b1d59 100644
> --- a/support/testing/tests/fs/test_ubi.py
> +++ b/support/testing/tests/fs/test_ubi.py
> @@ -32,7 +32,7 @@ class TestUbi(infra.basetest.BRTest):
> kernel_cmdline=["root=ubi0:rootfs",
> "ubi.mtd=0",
> "rootfstype=ubifs"],
> - options=["-drive", "file={},if=pflash".format(img)])
> + options=["-drive", "file={},if=pflash,format=raw".format(img)])
> self.emulator.login()
> cmd = "mount | grep 'ubi0:rootfs on / type ubifs'"
> _, exit_code = self.emulator.run(cmd)
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (10 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 14/16] support/testing: test_ubi: add image format on the qemu command line Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-17 19:51 ` Yann E. MORIN
2021-09-12 14:11 ` [Buildroot] [PATCH 16/16] support/testing: test_ubi: allow to boot several times using the same ubi image Romain Naour
2021-10-04 20:02 ` [Buildroot] [PATCH 03/16] support/testing: test_f2fs: bump to kernel 4.19.204 Peter Korsgaard
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni
The current ubi/ubifs test (test_ubi.py) rely on a Qemu bug present in
2.8.0 that was fixed in Qemu 2.9.0 [1]. The ubi/ubifs settings is
updated to run with Qemu >= 2.9.0 using the new multiple chip handling.
If needed, the old behavior can be enabled using the pflash01 property
"old-multiple-chip-handling" [2].
The issue was not detected until now since we are sill using an old
qemu (2.8 from Debian stretch) for testing in gitlab (using the
Buildroot Docker image used by gitlab-ci.yml).
First the logical eraseblock size (LEB) must be updated to the value
0x3ff80 reported by the kernel when using qemu >= 2.9.0.
UBIFS (ubi0:0): Mounting in unauthenticated mode
UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: LEB size mismatch: 524160 in superblock, 262016 real
UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: bad superblock, error 1
But the system is still failing to boot:
UBIFS error (ubi0:0 pid 1): ubifs_scan: garbage
UBIFS error (ubi0:0 pid 1): ubifs_recover_master_node: failed to recover master node
ubifs is reading garbage since Qemu >= 2.9.0 report a sector
length per device divided by the number of devices (see commit [1]).
The kernel detect two flash devices (dmesg):
Concatenating MTD devices:
(0): "40000000.flash"
(1): "40000000.flash"
into device "40000000.flash"
Divide the physical eraseblock (PEB) size by two.
Tested with qemu 2.9.0, 5.1.0.
Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/1543100932
[1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=feb0b1aa11f14ee71660aba46b46387d1f923c9e
[2] http://lists.busybox.net/pipermail/buildroot/2021-September/622069.html
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
support/testing/tests/fs/test_ubi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
index eeb55b1d59..7c687c1982 100644
--- a/support/testing/tests/fs/test_ubi.py
+++ b/support/testing/tests/fs/test_ubi.py
@@ -8,10 +8,10 @@ class TestUbi(infra.basetest.BRTest):
config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
"""
BR2_TARGET_ROOTFS_UBIFS=y
- BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x7ff80
+ BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3ff80
BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1
BR2_TARGET_ROOTFS_UBI=y
- BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x80000
+ BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
"""
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9
2021-09-12 14:11 ` [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9 Romain Naour
@ 2021-10-17 19:51 ` Yann E. MORIN
2021-10-17 20:05 ` Romain Naour
0 siblings, 1 reply; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 19:51 UTC (permalink / raw)
To: Romain Naour; +Cc: Thomas Petazzoni, buildroot
Romain, All,
On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
> The current ubi/ubifs test (test_ubi.py) rely on a Qemu bug present in
> 2.8.0 that was fixed in Qemu 2.9.0 [1]. The ubi/ubifs settings is
> updated to run with Qemu >= 2.9.0 using the new multiple chip handling.
>
> If needed, the old behavior can be enabled using the pflash01 property
> "old-multiple-chip-handling" [2].
>
> The issue was not detected until now since we are sill using an old
> qemu (2.8 from Debian stretch) for testing in gitlab (using the
> Buildroot Docker image used by gitlab-ci.yml).
>
> First the logical eraseblock size (LEB) must be updated to the value
> 0x3ff80 reported by the kernel when using qemu >= 2.9.0.
>
> UBIFS (ubi0:0): Mounting in unauthenticated mode
> UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: LEB size mismatch: 524160 in superblock, 262016 real
> UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: bad superblock, error 1
>
> But the system is still failing to boot:
>
> UBIFS error (ubi0:0 pid 1): ubifs_scan: garbage
> UBIFS error (ubi0:0 pid 1): ubifs_recover_master_node: failed to recover master node
>
> ubifs is reading garbage since Qemu >= 2.9.0 report a sector
> length per device divided by the number of devices (see commit [1]).
>
> The kernel detect two flash devices (dmesg):
>
> Concatenating MTD devices:
> (0): "40000000.flash"
> (1): "40000000.flash"
> into device "40000000.flash"
>
> Divide the physical eraseblock (PEB) size by two.
>
> Tested with qemu 2.9.0, 5.1.0.
>
> Fixes:
> https://gitlab.com/kubu93/buildroot/-/jobs/1543100932
>
> [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=feb0b1aa11f14ee71660aba46b46387d1f923c9e
> [2] http://lists.busybox.net/pipermail/buildroot/2021-September/622069.html
I am not sure I understood that reference: the patch in [2] was never
applied, it is no longer present in patchwork, but I could not find a
discsuuion about it either... Did you withdraw that patch?
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> support/testing/tests/fs/test_ubi.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
> index eeb55b1d59..7c687c1982 100644
> --- a/support/testing/tests/fs/test_ubi.py
> +++ b/support/testing/tests/fs/test_ubi.py
> @@ -8,10 +8,10 @@ class TestUbi(infra.basetest.BRTest):
> config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
> """
> BR2_TARGET_ROOTFS_UBIFS=y
> - BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x7ff80
> + BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3ff80
> BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1
> BR2_TARGET_ROOTFS_UBI=y
> - BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x80000
> + BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
> BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
> """
>
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* Re: [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9
2021-10-17 19:51 ` Yann E. MORIN
@ 2021-10-17 20:05 ` Romain Naour
0 siblings, 0 replies; 43+ messages in thread
From: Romain Naour @ 2021-10-17 20:05 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: Thomas Petazzoni, buildroot
Hello Yann,
Le 17/10/2021 à 21:51, Yann E. MORIN a écrit :
> Romain, All,
>
> On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
>> The current ubi/ubifs test (test_ubi.py) rely on a Qemu bug present in
>> 2.8.0 that was fixed in Qemu 2.9.0 [1]. The ubi/ubifs settings is
>> updated to run with Qemu >= 2.9.0 using the new multiple chip handling.
>>
>> If needed, the old behavior can be enabled using the pflash01 property
>> "old-multiple-chip-handling" [2].
>>
>> The issue was not detected until now since we are sill using an old
>> qemu (2.8 from Debian stretch) for testing in gitlab (using the
>> Buildroot Docker image used by gitlab-ci.yml).
>>
>> First the logical eraseblock size (LEB) must be updated to the value
>> 0x3ff80 reported by the kernel when using qemu >= 2.9.0.
>>
>> UBIFS (ubi0:0): Mounting in unauthenticated mode
>> UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: LEB size mismatch: 524160 in superblock, 262016 real
>> UBIFS error (ubi0:0 pid 1): ubifs_read_superblock: bad superblock, error 1
>>
>> But the system is still failing to boot:
>>
>> UBIFS error (ubi0:0 pid 1): ubifs_scan: garbage
>> UBIFS error (ubi0:0 pid 1): ubifs_recover_master_node: failed to recover master node
>>
>> ubifs is reading garbage since Qemu >= 2.9.0 report a sector
>> length per device divided by the number of devices (see commit [1]).
>>
>> The kernel detect two flash devices (dmesg):
>>
>> Concatenating MTD devices:
>> (0): "40000000.flash"
>> (1): "40000000.flash"
>> into device "40000000.flash"
>>
>> Divide the physical eraseblock (PEB) size by two.
>>
>> Tested with qemu 2.9.0, 5.1.0.
>>
>> Fixes:
>> https://gitlab.com/kubu93/buildroot/-/jobs/1543100932
>>
>> [1] https://git.qemu.org/?p=qemu.git;a=commitdiff;h=feb0b1aa11f14ee71660aba46b46387d1f923c9e
>> [2] http://lists.busybox.net/pipermail/buildroot/2021-September/622069.html
>
> I am not sure I understood that reference: the patch in [2] was never
> applied, it is no longer present in patchwork, but I could not find a
> discsuuion about it either... Did you withdraw that patch?
Yes, the patch [2] was a first attempt to fix the issue.
Thanks to this patch, it's not needed anymore.
Best regards,
Romain
>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>
> Applied to master, thanks.
>
> Regards,
> Yann E. MORIN.
>
>> ---
>> support/testing/tests/fs/test_ubi.py | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
>> index eeb55b1d59..7c687c1982 100644
>> --- a/support/testing/tests/fs/test_ubi.py
>> +++ b/support/testing/tests/fs/test_ubi.py
>> @@ -8,10 +8,10 @@ class TestUbi(infra.basetest.BRTest):
>> config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
>> """
>> BR2_TARGET_ROOTFS_UBIFS=y
>> - BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x7ff80
>> + BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x3ff80
>> BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1
>> BR2_TARGET_ROOTFS_UBI=y
>> - BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x80000
>> + BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
>> BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
>> """
>>
>> --
>> 2.31.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@lists.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] 43+ messages in thread
* [Buildroot] [PATCH 16/16] support/testing: test_ubi: allow to boot several times using the same ubi image.
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (11 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 15/16] support/testing: update logical eraseblock and physical eraseblock size for qemu >= 2.9 Romain Naour
@ 2021-09-12 14:11 ` Romain Naour
2021-10-17 19:51 ` Yann E. MORIN
2021-10-04 20:02 ` [Buildroot] [PATCH 03/16] support/testing: test_f2fs: bump to kernel 4.19.204 Peter Korsgaard
13 siblings, 1 reply; 43+ messages in thread
From: Romain Naour @ 2021-09-12 14:11 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Thomas Petazzoni
Since the ubi/ubifs test has been introduced, it's not possible to
boot the same ubi image twice [1]:
"TODO: if you boot Qemu twice on the same UBI image, it fails to
attach the image the second time, with "ubi0 error:
ubi_read_volume_table: the layout volume was not found"."
For some reason, the kernel corrupt the ubi image if the ubifs
rootfs is mounted with write access. Use a custom config file
to mount the rootfs readonly (vol_type=static). Doing so requires
to add the flash size (vol_size=64MiB).
At least it allows to boot several times the same ubi image.
[1] bf4a6490e4ee70f0a46e588602995ba34e6c872a
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
support/testing/tests/fs/test_ubi.py | 9 ++++-----
.../tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg | 8 ++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
index 7c687c1982..564a436d42 100644
--- a/support/testing/tests/fs/test_ubi.py
+++ b/support/testing/tests/fs/test_ubi.py
@@ -13,12 +13,11 @@ class TestUbi(infra.basetest.BRTest):
BR2_TARGET_ROOTFS_UBI=y
BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
- """
+ BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
+ BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="{}"
+ """.format(
+ infra.filepath("tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg"))
- # TODO: if you boot Qemu twice on the same UBI image, it fails to
- # attach the image the second time, with "ubi0 error:
- # ubi_read_volume_table: the layout volume was not found".
- # To be investigated.
def test_run(self):
img = os.path.join(self.builddir, "images", "rootfs.ubi")
out = infra.run_cmd_on_host(self.builddir, ["file", img])
diff --git a/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg b/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
new file mode 100644
index 0000000000..52dd5f0007
--- /dev/null
+++ b/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
@@ -0,0 +1,8 @@
+[ubifs]
+mode=ubi
+vol_id=0
+vol_type=static
+vol_name=rootfs
+vol_alignment=1
+vol_size=64MiB
+image=BR2_ROOTFS_UBIFS_PATH
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 43+ messages in thread* Re: [Buildroot] [PATCH 16/16] support/testing: test_ubi: allow to boot several times using the same ubi image.
2021-09-12 14:11 ` [Buildroot] [PATCH 16/16] support/testing: test_ubi: allow to boot several times using the same ubi image Romain Naour
@ 2021-10-17 19:51 ` Yann E. MORIN
0 siblings, 0 replies; 43+ messages in thread
From: Yann E. MORIN @ 2021-10-17 19:51 UTC (permalink / raw)
To: Romain Naour; +Cc: Thomas Petazzoni, buildroot
Romain, All,
On 2021-09-12 16:11 +0200, Romain Naour spake thusly:
> Since the ubi/ubifs test has been introduced, it's not possible to
> boot the same ubi image twice [1]:
>
> "TODO: if you boot Qemu twice on the same UBI image, it fails to
> attach the image the second time, with "ubi0 error:
> ubi_read_volume_table: the layout volume was not found"."
>
> For some reason, the kernel corrupt the ubi image if the ubifs
> rootfs is mounted with write access. Use a custom config file
> to mount the rootfs readonly (vol_type=static). Doing so requires
> to add the flash size (vol_size=64MiB).
>
> At least it allows to boot several times the same ubi image.
>
> [1] bf4a6490e4ee70f0a46e588602995ba34e6c872a
>
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> support/testing/tests/fs/test_ubi.py | 9 ++++-----
> .../tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg | 8 ++++++++
> 2 files changed, 12 insertions(+), 5 deletions(-)
> create mode 100644 support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
>
> diff --git a/support/testing/tests/fs/test_ubi.py b/support/testing/tests/fs/test_ubi.py
> index 7c687c1982..564a436d42 100644
> --- a/support/testing/tests/fs/test_ubi.py
> +++ b/support/testing/tests/fs/test_ubi.py
> @@ -13,12 +13,11 @@ class TestUbi(infra.basetest.BRTest):
> BR2_TARGET_ROOTFS_UBI=y
> BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x40000
> BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
> - """
> + BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG=y
> + BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE="{}"
> + """.format(
> + infra.filepath("tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg"))
>
> - # TODO: if you boot Qemu twice on the same UBI image, it fails to
> - # attach the image the second time, with "ubi0 error:
> - # ubi_read_volume_table: the layout volume was not found".
> - # To be investigated.
> def test_run(self):
> img = os.path.join(self.builddir, "images", "rootfs.ubi")
> out = infra.run_cmd_on_host(self.builddir, ["file", img])
> diff --git a/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg b/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
> new file mode 100644
> index 0000000000..52dd5f0007
> --- /dev/null
> +++ b/support/testing/tests/fs/test_ubi/ubinize_qemu_pflash_cfi01.cfg
> @@ -0,0 +1,8 @@
> +[ubifs]
> +mode=ubi
> +vol_id=0
> +vol_type=static
> +vol_name=rootfs
> +vol_alignment=1
> +vol_size=64MiB
> +image=BR2_ROOTFS_UBIFS_PATH
> --
> 2.31.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@lists.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] 43+ messages in thread
* Re: [Buildroot] [PATCH 03/16] support/testing: test_f2fs: bump to kernel 4.19.204
2021-09-12 14:11 [Buildroot] [PATCH 03/16] support/testing: test_f2fs: " Romain Naour
` (12 preceding siblings ...)
2021-09-12 14:11 ` [Buildroot] [PATCH 16/16] support/testing: test_ubi: allow to boot several times using the same ubi image Romain Naour
@ 2021-10-04 20:02 ` Peter Korsgaard
13 siblings, 0 replies; 43+ messages in thread
From: Peter Korsgaard @ 2021-10-04 20:02 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> The kernel 4.16.7 curently used by the test doesn't build with host
> gcc >= 10 due the gcc default -fno-common. See GCC 10 porting guide [1].
> /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x20): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
> Bump to the next LTS release.
> [1] https://gcc.gnu.org/gcc-10/porting_to.html
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 43+ messages in thread