From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 1 Apr 2025 07:39:56 +0000 (+0000)
Subject: btrfs-tools: upgrade 6.13 -> 6.14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9fa83db647f7f38b53ac850725aec17ced001ec;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

btrfs-tools: upgrade 6.13 -> 6.14

Add tag to SRC_URI to verify SRCREV.

Drop patch merged upstream.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
index 59ea5a66da..2cd66d2722 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
@@ -1,4 +1,4 @@
-From 76e635a56c5973671da3a8a2fd4fc32e823bf8c9 Mon Sep 17 00:00:00 2001
+From 030ec81c0dac1e067faf49924d5631bb22ccc90d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 23 May 2018 21:20:35 +0300
 Subject: [PATCH] Add a possibility to specify where python modules are
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 2f8d2fa0..c760e5ae 100644
+index 7e36aa42..edff7d5b 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -985,7 +985,7 @@ endif
+@@ -996,7 +996,7 @@ endif
  ifeq ($(PYTHON_BINDINGS),1)
  install_python: libbtrfsutil_python
  	$(Q)cd libbtrfsutil/python; \
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
deleted file mode 100644
index 750ba83074..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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.13.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb
similarity index 95%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb
index d73d86ba8a..d3d320e107 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.13.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb
@@ -15,11 +15,10 @@ LIC_FILES_CHKSUM = " \
 SECTION = "base"
 DEPENDS = "util-linux zlib"
 
-SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;tag=v${PV} \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
-           file://0001-mkfs-add-break-to-case-BTRFS_COMPRESS_NONE.patch \
            "
-SRCREV = "26e4d9174c70aac0e53c3b5de55cf159f8d9397f"
+SRCREV = "5ad147c9ec00e657393c85b195c9bcc0f4c35a54"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \