diff options
| author | Wang Mingyu <wangmy@fujitsu.com> | 2025-03-11 15:36:18 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-13 11:00:35 +0000 |
| commit | 7fdabb677e9d909a3ae218c27f49f600f3dac421 (patch) | |
| tree | 4fd6f0822a79d3c7291f591a9612bdae2a9e588b | |
| parent | ce7beeb9d6dbfd43fc776652fba9fcd678313ec6 (diff) | |
| download | poky-7fdabb677e9d909a3ae218c27f49f600f3dac421.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb) | 3 |
2 files changed, 42 insertions, 1 deletions
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 @@ | |||
| 1 | From ae0743dea3498429fce144e75c8b5b6eeed6f490 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
| 3 | Date: Tue, 11 Mar 2025 05:24:54 +0000 | ||
| 4 | Subject: [PATCH] mkfs: add break to case BTRFS_COMPRESS_NONE | ||
| 5 | |||
| 6 | when compression null, always through error "lzo support not compiled in" | ||
| 7 | |||
| 8 | This bug was imported by following commit: | ||
| 9 | ---------------------------------------------------- | ||
| 10 | commit c6d24a363daed6501d13d9125c560387e2d755ca | ||
| 11 | Author: Mark Harmstone <maharmstone@fb.com> | ||
| 12 | Date: Thu Dec 12 20:36:55 2024 +0000 | ||
| 13 | |||
| 14 | btrfs-progs: mkfs: add lzo to --compress option | ||
| 15 | |||
| 16 | Allow --compress to work with lzo. | ||
| 17 | ---------------------------------------------------- | ||
| 18 | |||
| 19 | Upstream-Status: Submitted [https://github.com/kdave/btrfs-progs/pull/967] | ||
| 20 | |||
| 21 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 22 | --- | ||
| 23 | mkfs/rootdir.c | 1 + | ||
| 24 | 1 file changed, 1 insertion(+) | ||
| 25 | |||
| 26 | diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c | ||
| 27 | index 1927394..5f4cfb9 100644 | ||
| 28 | --- a/mkfs/rootdir.c | ||
| 29 | +++ b/mkfs/rootdir.c | ||
| 30 | @@ -1654,6 +1654,7 @@ int btrfs_mkfs_fill_dir(struct btrfs_trans_handle *trans, const char *source_dir | ||
| 31 | |||
| 32 | switch (compression) { | ||
| 33 | case BTRFS_COMPRESS_NONE: | ||
| 34 | + break; | ||
| 35 | case BTRFS_COMPRESS_LZO: | ||
| 36 | #if !COMPRESSION_LZO | ||
| 37 | error("lzo support not compiled in"); | ||
| 38 | -- | ||
| 39 | 2.43.0 | ||
| 40 | |||
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.12.bb b/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" | |||
| 17 | 17 | ||
| 18 | SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https \ | 18 | SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https \ |
| 19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ | 19 | file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ |
| 20 | file://0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch \ | ||
| 20 | " | 21 | " |
| 21 | SRCREV = "85ca0a6d60c14eefda509970a26616ff16115612" | 22 | SRCREV = "26e4d9174c70aac0e53c3b5de55cf159f8d9397f" |
| 22 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
| 23 | 24 | ||
| 24 | PACKAGECONFIG ??= " \ | 25 | PACKAGECONFIG ??= " \ |
