From patchwork Mon Jul 15 19:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 46461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 933DEC54E75 for ; Mon, 15 Jul 2024 19:19:21 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web10.1361.1721071146299283167 for ; Mon, 15 Jul 2024 12:19:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=QdBubNJy; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=Z3iw/2mc; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 01010190b7d5920d-10ac8194-424d-4f3f-8e8a-d69cf5595852-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1721071145; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=kD/Qkprh3jRY6jL5YQljDrFEDzJ6uwpCXcv/dX2SCgk=; b=QdBubNJyGlq+0aDYvtYuOMO3Nx7YyMn1m+CrvU+hrqHvzOinDIlAGkpwFNlajKR0 Kw9Z+iqQgnX8EUimcjP+JoDkEqKbpmVkGkSi/HNfDMPQ/U5MiP+tGa4RBGnYkRS8MdQ CtHDwretOUAMfSVuaBbYw6CnaxOYaEkGVSTztHDA= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1721071145; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=kD/Qkprh3jRY6jL5YQljDrFEDzJ6uwpCXcv/dX2SCgk=; b=Z3iw/2mcPrPxUYTZsZzTW0s7jkLRJhWZ6856UQJLQqZcJFBtZPfASmk34ovUOKJ9 c0V3s2HXs0djiLyLFMlHG8kUW3a1eQPSM8NGl6W8bJX7cLe5YnQ7hPcoL0rTyOK8gZQ i/IDv5Q5Yrh1eFVkOYV0MURtO5gC2/fYRHe0c+VM= MIME-Version: 1.0 From: auh@yoctoproject.org To: Wang Mingyu Cc: openembedded-core@lists.openembedded.org Subject: [AUH] btrfs-tools: upgrading to 6.9.2 SUCCEEDED Message-ID: <01010190b7d5920d-10ac8194-424d-4f3f-8e8a-d69cf5595852-000000@us-west-2.amazonses.com> Date: Mon, 15 Jul 2024 19:19:05 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.07.15-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jul 2024 19:19:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201960 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *btrfs-tools* to *6.9.2* has Succeeded. Next steps: - apply the patch: git am 0001-btrfs-tools-upgrade-6.8.1-6.9.2.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 5f6831284fd24b89cdddbcde972c67c7ca005cb7 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 15 Jul 2024 08:42:12 +0000 Subject: [PATCH] btrfs-tools: upgrade 6.8.1 -> 6.9.2 --- ...y-to-specify-where-python-modules-ar.patch | 6 +- ...ename-of-inode_includes-from-e2fspro.patch | 64 ------------------- ...fs-tools_6.8.1.bb => btrfs-tools_6.9.2.bb} | 3 +- 3 files changed, 4 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.8.1.bb => btrfs-tools_6.9.2.bb} (95%) 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 4b1797b65f..2984a6a1ad 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 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001 +From 68203da88f59d78e539710a76d4eaa30d3a31817 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 374f59b9..ed083f6b 100644 +index 82dfb1b4..4968989a 100644 --- a/Makefile +++ b/Makefile -@@ -959,7 +959,7 @@ endif +@@ -984,7 +984,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-convert-handle-rename-of-inode_includes-from-e2fspro.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch deleted file mode 100644 index 6fefbb2bca..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch +++ /dev/null @@ -1,64 +0,0 @@ -From f9ba9752ba5fd72441bc2018b2453967e75460d4 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu -Date: Mon, 24 Jun 2024 02:00:11 +0000 -Subject: [PATCH] convert: handle rename of inode_includes() from e2fsprogs - 1.47.1 - -Upstream-Status: Backport -[https://kernel.googlesource.com/pub/scm/linux/kernel/git/kdave/btrfs-progs/+/bcb887a4de2c56426a7a7de8d440b6ad75579f10%5E%21/#F0] - -Signed-off-by: Wang Mingyu ---- - configure.ac | 3 ++- - convert/source-ext2.c | 11 +++++++++-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 007d29b..816dd36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -312,7 +312,8 @@ AS_IF([test "x$have_ext4_epoch_mask_define" = xno], [ - AC_DEFINE([EXT4_EPOCH_BITS], [2],[for encode and decode tv_nsec in ext2 inode]) - AC_DEFINE([EXT4_EPOCH_MASK], [((1U << EXT4_EPOCH_BITS) - 1)], [For encode and decode tv_nsec info in ext2 inode]) - AC_DEFINE([EXT4_NSEC_MASK], [(~0UL << EXT4_EPOCH_BITS)], [For encode and decode tv_nsec info in ext2 inode]) -- AC_DEFINE([inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], -+ # Use name from 1.47.1, backward compatibility is handled in convert/source-ext2.c -+ AC_DEFINE([ext2fs_inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]], - [For encode and decode tv_nsec info in ext2 inode]) - ], - [AC_MSG_WARN([It seems that ext2_inode_large don't includes tv_nsec related info, probably old e2fsprogs, no 64bit time precision of converted images])], -diff --git a/convert/source-ext2.c b/convert/source-ext2.c -index 2186b25..bba81e4 100644 ---- a/convert/source-ext2.c -+++ b/convert/source-ext2.c -@@ -727,10 +727,17 @@ static inline void ext4_decode_extra_time(__le32 * tv_sec, __le32 * tv_nsec, - *tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS; - } - -+/* -+ * In e2fsprogs < 1.47.1 it's inode_includes, from >= on it's with ext2fs_ prefix. -+ */ -+#ifndef ext2fs_inode_includes -+#define ext2fs_inode_includes(size, field) inode_includes(size, field) -+#endif -+ - #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec) \ - do { \ - tv_sec = src->i_ ## xtime ; \ -- if (inode_includes(inode_size, i_ ## xtime ## _extra)) { \ -+ if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) { \ - tv_sec = src->i_ ## xtime ; \ - ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ## _extra); \ - btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec); \ -@@ -771,7 +778,7 @@ static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst, - EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec); - - tv_sec = src->i_crtime; -- if (inode_includes(inode_size, i_crtime_extra)) { -+ if (ext2fs_inode_includes(inode_size, i_crtime_extra)) { - tv_sec = src->i_crtime; - ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra); - btrfs_set_stack_timespec_sec(&dst->otime, tv_sec); --- -2.34.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.9.2.bb similarity index 95% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.9.2.bb index d61d956a70..9f5586490d 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.9.2.bb @@ -17,9 +17,8 @@ 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 \ - file://0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch \ " -SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e" +SRCREV = "b0e5ef4cf7c8b473119e0d487a26b96058e8f80d" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \