btrfs-tools: upgrade 6.12 -> 6.13

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

(From OE-Core rev: c0cd0079c4f0cdc54843713a6985563a153a3395)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2025-03-11 15:36:18 +08:00
committed by Richard Purdie
parent ce7beeb9d6
commit 7fdabb677e
2 changed files with 42 additions and 1 deletions

View File

@@ -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

View File

@@ -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 ??= " \