From 107b3cb91c72e2ac498356407ad60667d61c897a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 13 Apr 2024 00:24:59 +0200 Subject: [PATCH] support/testing: lvm2: remove kernel config fragment The lvm2 package now enables the required Kernel configuration. The Kernel config fragment included in this test is no longer needed. This commit removes it. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 9339343111a54a2648953f0bace70b01a68c37ec) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - support/testing/tests/package/test_lvm2.py | 11 ++++------- .../tests/package/test_lvm2/linux-lvm2.fragment | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 support/testing/tests/package/test_lvm2/linux-lvm2.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 2fd801f55e..853d8d6c90 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1812,7 +1812,6 @@ F: support/testing/tests/package/test_links/ F: support/testing/tests/package/test_lrzip.py F: support/testing/tests/package/test_ltrace.py F: support/testing/tests/package/test_lvm2.py -F: support/testing/tests/package/test_lvm2/ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py diff --git a/support/testing/tests/package/test_lvm2.py b/support/testing/tests/package/test_lvm2.py index bdbae7a4ec..75ea3fa449 100644 --- a/support/testing/tests/package/test_lvm2.py +++ b/support/testing/tests/package/test_lvm2.py @@ -5,13 +5,11 @@ import infra.basetest class TestLvm2(infra.basetest.BRTest): - # This test creates a lvm2 volume. A specific Kernel need to be - # built with a config fragment enabling this support. This test - # also uses resize2fs from e2fsprogs. - kernel_fragment = \ - infra.filepath("tests/package/test_lvm2/linux-lvm2.fragment") + # The lvm2 package has _LINUX_CONFIG_FIXUPS, so we cannot use + # the runtime test pre-built Kernel. We need to compile a Kernel + # to make sure it will include the required configuration. config = \ - f""" + """ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" @@ -20,7 +18,6 @@ class TestLvm2(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.77" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" - BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kernel_fragment}" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_E2FSPROGS=y BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y diff --git a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment b/support/testing/tests/package/test_lvm2/linux-lvm2.fragment deleted file mode 100644 index 0fade167a3..0000000000 --- a/support/testing/tests/package/test_lvm2/linux-lvm2.fragment +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y