Skip to contentSkip to conversation

btrfs-tools: upgrade 6.12 -> 6.13

PATCH Superseded [email protected] 2 participants 2 messages Mar 11, 2025

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 btrfs-tools: upgrade 6.12 -> 6.13

From: Wang Mingyu <[email protected]>

Add patch fix the error when do_image_btrfs:
ERROR: lzo support not compiled in

---
 ...dd-break-to-case-BTRFS_COMPRESS_NONE.patch | 40 +++++++++++++++++++
 ...trfs-tools_6.12.bb => btrfs-tools_6.13.bb} |  3 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.12.bb => btrfs-tools_6.13.bb} (95%)
meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch new file +40 -0
new file mode 100644
index 0000000000..3037d36644
@@ -0,0 +1,40 @@
+From ae0743dea3498429fce144e75c8b5b6eeed6f490 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <[email protected]>
+Date: Tue, 11 Mar 2025 05:24:54 +0000
+Subject: [PATCH] mkfs: add break to case BTRFS_COMPRESS_NONE
+
+when compression null, always through error "lzo support not compiled in"
+
+This bug was imported by following commit:
+----------------------------------------------------
+commit c6d24a363daed6501d13d9125c560387e2d755ca
+Author: Mark Harmstone <[email protected]>
+Date:   Thu Dec 12 20:36:55 2024 +0000
+
+     btrfs-progs: mkfs: add lzo to --compress option
+
+     Allow --compress to work with lzo.
+----------------------------------------------------
+
+Upstream-Status: Summited [https://github.com/kdave/btrfs-progs/pull/967]
+
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ mkfs/rootdir.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
+index 1927394..5f4cfb9 100644
+--- a/mkfs/rootdir.c
++++ b/mkfs/rootdir.c
+@@ -1654,6 +1654,7 @@ int btrfs_mkfs_fill_dir(struct btrfs_trans_handle *trans, const char *source_dir
+ 
+ 	switch (compression) {
+ 	case BTRFS_COMPRESS_NONE:
++                break;
+ 	case BTRFS_COMPRESS_LZO:
+ #if !COMPRESSION_LZO
+ 		error("lzo support not compiled in");
+-- 
+2.43.0
+
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb +2 -1
similarity index 95%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb
index 3c0bb81f75..d73d86ba8a 100644
@@ -17,8 +17,9 @@ DEPENDS = "util-linux zlib"
 
 SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
+           file://0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch \
            "
-SRCREV = "85ca0a6d60c14eefda509970a26616ff16115612"
+SRCREV = "26e4d9174c70aac0e53c3b5de55cf159f8d9397f"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
Signature · 1 line
2.43.0
#1 lore raw

Patchtest results for [OE-core] [PATCH v3] btrfs-tools: upgrade 6.12 -> 6.13

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/v3-btrfs-tools-upgrade-6.12---6.13.patch

FAIL: test Upstream-Status presence: Upstream-Status is in incorrect format (test_patch.TestPatch.test_upstream_status_presence_format)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!