summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-06 07:42:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-07 17:25:02 +0000
commit35f3279165ccd38f8057ffdfe719510d2bc02d06 (patch)
tree046dc7d6f9afd32d077177b54f54a4641bb9de84 /meta/recipes-devtools/btrfs-tools
parent51fae36d0ccb53d3e335f37b0d96488e64ac0d8b (diff)
downloadpoky-35f3279165ccd38f8057ffdfe719510d2bc02d06.tar.gz
btrfs-tools: upgrade 6.5.3 -> 6.7.1
(From OE-Core rev: ba87e34dc47559ffd02370169e8fa37dd080a56e) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch6
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_6.7.1.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.5.3.bb)4
2 files changed, 5 insertions, 5 deletions
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 5846f04d1a..4b1797b65f 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 @@
1From d3adfc21c9cc264bd191722f102963cbc4794259 Mon Sep 17 00:00:00 2001 1From 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 23 May 2018 21:20:35 +0300 3Date: Wed, 23 May 2018 21:20:35 +0300
4Subject: [PATCH] Add a possibility to specify where python modules are 4Subject: [PATCH] Add a possibility to specify where python modules are
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/Makefile b/Makefile 13diff --git a/Makefile b/Makefile
14index 1697794c..8ab38818 100644 14index 374f59b9..ed083f6b 100644
15--- a/Makefile 15--- a/Makefile
16+++ b/Makefile 16+++ b/Makefile
17@@ -651,7 +651,7 @@ endif 17@@ -959,7 +959,7 @@ endif
18 ifeq ($(PYTHON_BINDINGS),1) 18 ifeq ($(PYTHON_BINDINGS),1)
19 install_python: libbtrfsutil_python 19 install_python: libbtrfsutil_python
20 $(Q)cd libbtrfsutil/python; \ 20 $(Q)cd libbtrfsutil/python; \
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.5.3.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.7.1.bb
index 6455efd1bc..8132c2cc72 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.5.3.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.7.1.bb
@@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib"
18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ 18SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/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 " 20 "
21SRCREV = "a45c360b64660477c726e192d9e92ceb73a50f80" 21SRCREV = "60abf7a90776c2405f616182ef6129474bbcb109"
22S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
23 23
24PACKAGECONFIG ??= " \ 24PACKAGECONFIG ??= " \
@@ -27,7 +27,7 @@ PACKAGECONFIG ??= " \
27 python \ 27 python \
28 crypto-builtin \ 28 crypto-builtin \
29" 29"
30PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native" 30PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native python3-sphinx-rtd-theme-native"
31PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" 31PACKAGECONFIG[programs] = "--enable-programs,--disable-programs"
32PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" 32PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs"
33PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned" 33PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned"