Re: [OE-core] [PATCH] btrfs-tools: upgrade 6.5.3 -> 6.6.3

Alexandre Belloni
2024-01-19T10:16:06Z

This causes oe-selftest failures:

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/6326/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/6317/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/6328/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/6266/steps/14/logs/stdio

On 16/01/2024 10:06:36+0800, wangmy wrote:
> From: Jiang Kai <jiangkai@fujitsu.com>
>
> 0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
> refreshed for 6.6.3
>
> Changelog:
> ==========
> * subvol create: accept multiple arguments
> * subvol delete: print the subvolume id in the output
> * subvol sync: check if the filesystems is still writeable so it does not
> wait indefinitely
> * device delete: add a timeout and warning when deleting multiple devices
> * scrub status: report limit if set in sysfs/../scrub_speed_max
> * scrub limit: new command to show or set the per-device scrub limits
> * scrub start: report the limit if set
> * build:
> * fix CPU feature detection on aarch64
> * support Botan and OpenSSL (3.2+) as crypto backends
> * other:
> * documentation updates, RTD config update
> * new and updated tests
> * CI updates
>
> Signed-off-by: Jiang Kai <jiangkai@fujitsu.com>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
> ...-a-possibility-to-specify-where-python-modules-ar.patch | 7 ++++---
> .../{btrfs-tools_6.5.3.bb => btrfs-tools_6.6.3.bb} | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
> rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.5.3.bb => btrfs-tools_6.6.3.bb} (98%)
>
> 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..ed2c64eb4c 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 d3adfc21c9cc264bd191722f102963cbc4794259 Mon Sep 17 00:00:00 2001
> +From ddfdc0102c22e8dc782c34b8a03777fb73dfddf6 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
> @@ -6,15 +6,16 @@ Subject: [PATCH] Add a possibility to specify where python modules are
>
> Upstream-Status: Inappropriate [oe-core specific to solve multilib use case]
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> -index 1697794c..8ab38818 100644
> +index 374f59b9..ed083f6b 100644
> --- a/Makefile
> +++ b/Makefile
> -@@ -651,7 +651,7 @@ endif
> +@@ -959,7 +959,7 @@ endif
> ifeq ($(PYTHON_BINDINGS),1)
> install_python: libbtrfsutil_python
> $(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.6.3.bb
> similarity index 98%
> rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.5.3.bb
> rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.6.3.bb
> index 873d5e7a14..ef40f553fb 100644
> --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.5.3.bb
> +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.6.3.bb
> @@ -18,7 +18,7 @@ DEPENDS = "util-linux zlib"
> SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \
> file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
> "
> -SRCREV = "a45c360b64660477c726e192d9e92ceb73a50f80"
> +SRCREV = "92e18dbce521789e02057d406769b073d474fa72"
> S = "${WORKDIR}/git"
>
> PACKAGECONFIG ??= " \
> --
> 2.34.1
>

>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#193809): https://lists.openembedded.org/g/openembedded-core/message/193809
> Mute This Topic: https://lists.openembedded.org/mt/103754480/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering