diff mbox series

[v4] btrfs-tools: upgrade 6.12 -> 6.13

Message ID 1741678578-8179-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [v4] btrfs-tools: upgrade 6.12 -> 6.13 | expand

Commit Message

Mingyu Wang (Fujitsu) March 11, 2025, 7:36 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...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%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch
new file mode 100644
index 0000000000..750ba83074
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch
@@ -0,0 +1,40 @@ 
+From ae0743dea3498429fce144e75c8b5b6eeed6f490 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+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 <maharmstone@fb.com>
+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: Submitted [https://github.com/kdave/btrfs-progs/pull/967]
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ 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
+
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb
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
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb
@@ -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 ??= " \