diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:04 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:02 +0000 |
| commit | 35f3279165ccd38f8057ffdfe719510d2bc02d06 (patch) | |
| tree | 046dc7d6f9afd32d077177b54f54a4641bb9de84 | |
| parent | 51fae36d0ccb53d3e335f37b0d96488e64ac0d8b (diff) | |
| download | poky-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>
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch | 6 | ||||
| -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 @@ | |||
| 1 | From d3adfc21c9cc264bd191722f102963cbc4794259 Mon Sep 17 00:00:00 2001 | 1 | From 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Wed, 23 May 2018 21:20:35 +0300 | 3 | Date: Wed, 23 May 2018 21:20:35 +0300 |
| 4 | Subject: [PATCH] Add a possibility to specify where python modules are | 4 | Subject: [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 | ||
| 13 | diff --git a/Makefile b/Makefile | 13 | diff --git a/Makefile b/Makefile |
| 14 | index 1697794c..8ab38818 100644 | 14 | index 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" | |||
| 18 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \ | 18 | SRC_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 | " |
| 21 | SRCREV = "a45c360b64660477c726e192d9e92ceb73a50f80" | 21 | SRCREV = "60abf7a90776c2405f616182ef6129474bbcb109" |
| 22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
| 23 | 23 | ||
| 24 | PACKAGECONFIG ??= " \ | 24 | PACKAGECONFIG ??= " \ |
| @@ -27,7 +27,7 @@ PACKAGECONFIG ??= " \ | |||
| 27 | python \ | 27 | python \ |
| 28 | crypto-builtin \ | 28 | crypto-builtin \ |
| 29 | " | 29 | " |
| 30 | PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native" | 30 | PACKAGECONFIG[manpages] = "--enable-documentation, --disable-documentation, python3-sphinx-native python3-sphinx-rtd-theme-native" |
| 31 | PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" | 31 | PACKAGECONFIG[programs] = "--enable-programs,--disable-programs" |
| 32 | PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" | 32 | PACKAGECONFIG[convert] = "--enable-convert --with-convert=ext2,--disable-convert --without-convert,e2fsprogs" |
| 33 | PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned" | 33 | PACKAGECONFIG[zoned] = "--enable-zoned,--disable-zoned" |
