| Message ID | 1642429806-13814-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | Accepted, archived |
| Commit | 420191dc951f04b36645ffae2d946b50150feab0 |
| Headers | show |
| Series | btrfs-tools: upgrade 5.15.1 -> 5.16 | expand |
On Mon, 2022-01-17 at 22:30 +0800, wangmy wrote: > Changelog: > ========= > - rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid > subvolume keys, caught by tree-checker > - fi du: skip inaccessible files > - prop: properly resolve to symlink targets > - send, receive: fix crash after parent subvolume lookup errors > - build: > fix build on 5.12+ kernels due to changes in linux/kernel.h > fix build on musl with old kernel headers > - other: > error handling fixes, cleanups, refactoring > extent tree v2 preparatory work > lots of RST documentation updates (last release with asciidoc sources), > https://btrfs.readthedocs.io > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++------ > .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} | 2 +- > 2 files changed, 5 insertions(+), 7 deletions(-) > rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%) > > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > index be942388a5..bd69bfc9cd 100644 > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > @@ -1,4 +1,4 @@ > -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001 > +From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001 > From: Bruce Ashfield <bruce.ashfield@gmail.com> > Date: Fri, 18 Jun 2021 11:10:36 -0400 > Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ > @@ -21,22 +21,20 @@ exists, and is valid to include. > Upstream-Status: Inappropriate [mips64 + musl + libc-headers] > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> > + > --- > kerncompat.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kerncompat.h b/kerncompat.h > -index df167fe6..254235bd 100644 > +index 6ca1526e..15995bb4 100644 > --- a/kerncompat.h > +++ b/kerncompat.h > @@ -30,6 +30,7 @@ > #include <linux/types.h> > - #include <linux/kernel.h> > + #include <linux/const.h> > #include <stdint.h> > +#include <linux/const.h> > > #include <features.h> > > --- > -2.25.1 > - > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > similarity index 98% > rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb > rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > index 3cf216724e..4c358a248b 100644 > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > @@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b > file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ > file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \ > " > -SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43" > +SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8" > S = "${WORKDIR}/git" > > PACKAGECONFIG ??= " \ This didn't work when it was last sent and still doesn't: https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/4646 https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/4914 https://autobuilder.yoctoproject.org/typhoon/#/builders/111/builds/2590 https://autobuilder.yoctoproject.org/typhoon/#/builders/48/builds/4624 https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/3508 https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/4616 https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/4631 https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/4583 https://autobuilder.yoctoproject.org/typhoon/#/builders/73/builds/4583 Seems to be something centos host specific. Cheers, Richard
On Mon, 2022-01-17 at 22:30 +0800, wangmy wrote: > Changelog: > ========= > - rescue: new subcommand clear-uuid-tree to fix failed mount due to > bad uuid > subvolume keys, caught by tree-checker > - fi du: skip inaccessible files > - prop: properly resolve to symlink targets > - send, receive: fix crash after parent subvolume lookup errors > - build: > fix build on 5.12+ kernels due to changes in linux/kernel.h > fix build on musl with old kernel headers > - other: > error handling fixes, cleanups, refactoring > extent tree v2 preparatory work > lots of RST documentation updates (last release with asciidoc > sources), > https://btrfs.readthedocs.io > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- > -- > .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} | 2 +- > 2 files changed, 5 insertions(+), 7 deletions(-) > rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => > btrfs-tools_5.16.bb} (98%) > > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001- > btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > include-linux-const.h-to-fix-build-with-.patch > index be942388a5..bd69bfc9cd 100644 > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > include-linux-const.h-to-fix-build-with-.patch > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > include-linux-const.h-to-fix-build-with-.patch > @@ -1,4 +1,4 @@ > -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 > 2001 > +From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 > 2001 > From: Bruce Ashfield <bruce.ashfield@gmail.com> > Date: Fri, 18 Jun 2021 11:10:36 -0400 > Subject: [PATCH] btrfs-progs: include linux/const.h to fix build > with 5.12+ > @@ -21,22 +21,20 @@ exists, and is valid to include. > Upstream-Status: Inappropriate [mips64 + musl + libc-headers] > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> > + > --- > kerncompat.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/kerncompat.h b/kerncompat.h > -index df167fe6..254235bd 100644 > +index 6ca1526e..15995bb4 100644 > --- a/kerncompat.h > +++ b/kerncompat.h > @@ -30,6 +30,7 @@ > #include <linux/types.h> > - #include <linux/kernel.h> > + #include <linux/const.h> > #include <stdint.h> > +#include <linux/const.h> This patch should be removed. https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104 Thanks, Anuj > > #include <features.h> > > --- > -2.25.1 > - > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb > b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > similarity index 98% > rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb > rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > index 3cf216724e..4c358a248b 100644 > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb > @@ -19,7 +19,7 @@ SRC_URI = > "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs- > progs.git;b > > file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch > \ > > file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > \ > " > -SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43" > +SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8" > S = "${WORKDIR}/git" > > PACKAGECONFIG ??= " \ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#160645): > https://lists.openembedded.org/g/openembedded-core/message/160645 > Mute This Topic: https://lists.openembedded.org/mt/88484706/3616702 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: > https://lists.openembedded.org/g/openembedded-core/unsub [ > anuj.mittal@intel.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hello, On 17/01/2022 23:39:50+0000, Anuj Mittal wrote: > On Mon, 2022-01-17 at 22:30 +0800, wangmy wrote: > > Changelog: > > ========= > > - rescue: new subcommand clear-uuid-tree to fix failed mount due to > > bad uuid > > subvolume keys, caught by tree-checker > > - fi du: skip inaccessible files > > - prop: properly resolve to symlink targets > > - send, receive: fix crash after parent subvolume lookup errors > > - build: > > fix build on 5.12+ kernels due to changes in linux/kernel.h > > fix build on musl with old kernel headers > > - other: > > error handling fixes, cleanups, refactoring > > extent tree v2 preparatory work > > lots of RST documentation updates (last release with asciidoc > > sources), > > https://btrfs.readthedocs.io > > > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > > --- > > ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- > > -- > > .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} | 2 +- > > 2 files changed, 5 insertions(+), 7 deletions(-) > > rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => > > btrfs-tools_5.16.bb} (98%) > > > > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001- > > btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > > b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > include-linux-const.h-to-fix-build-with-.patch > > index be942388a5..bd69bfc9cd 100644 > > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > include-linux-const.h-to-fix-build-with-.patch > > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > include-linux-const.h-to-fix-build-with-.patch > > @@ -1,4 +1,4 @@ > > -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 > > 2001 > > +From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 > > 2001 > > From: Bruce Ashfield <bruce.ashfield@gmail.com> > > Date: Fri, 18 Jun 2021 11:10:36 -0400 > > Subject: [PATCH] btrfs-progs: include linux/const.h to fix build > > with 5.12+ > > @@ -21,22 +21,20 @@ exists, and is valid to include. > > Upstream-Status: Inappropriate [mips64 + musl + libc-headers] > > > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> > > + > > --- > > kerncompat.h | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/kerncompat.h b/kerncompat.h > > -index df167fe6..254235bd 100644 > > +index 6ca1526e..15995bb4 100644 > > --- a/kerncompat.h > > +++ b/kerncompat.h > > @@ -30,6 +30,7 @@ > > #include <linux/types.h> > > - #include <linux/kernel.h> > > + #include <linux/const.h> > > #include <stdint.h> > > +#include <linux/const.h> > > This patch should be removed. > > https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104 > I guess we actually need to backport this one: https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 It should fix the issue as reported in https://github.com/kdave/btrfs-progs/pull/433
On Wed, 2022-01-19 at 00:33 +0100, Alexandre Belloni wrote: > Hello, > > On 17/01/2022 23:39:50+0000, Anuj Mittal wrote: > > On Mon, 2022-01-17 at 22:30 +0800, wangmy wrote: > > > Changelog: > > > ========= > > > - rescue: new subcommand clear-uuid-tree to fix failed mount due to > > > bad uuid > > > subvolume keys, caught by tree-checker > > > - fi du: skip inaccessible files > > > - prop: properly resolve to symlink targets > > > - send, receive: fix crash after parent subvolume lookup errors > > > - build: > > > fix build on 5.12+ kernels due to changes in linux/kernel.h > > > fix build on musl with old kernel headers > > > - other: > > > error handling fixes, cleanups, refactoring > > > extent tree v2 preparatory work > > > lots of RST documentation updates (last release with asciidoc > > > sources), > > > https://btrfs.readthedocs.io > > > > > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > > > --- > > > ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++---- > > > -- > > > .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} | 2 +- > > > 2 files changed, 5 insertions(+), 7 deletions(-) > > > rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => > > > btrfs-tools_5.16.bb} (98%) > > > > > > diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001- > > > btrfs-tools-include-linux-const.h-to-fix-build-with-.patch > > > b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > > include-linux-const.h-to-fix-build-with-.patch > > > index be942388a5..bd69bfc9cd 100644 > > > --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > > include-linux-const.h-to-fix-build-with-.patch > > > +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools- > > > include-linux-const.h-to-fix-build-with-.patch > > > @@ -1,4 +1,4 @@ > > > -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 > > > 2001 > > > +From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 > > > 2001 > > > From: Bruce Ashfield <bruce.ashfield@gmail.com> > > > Date: Fri, 18 Jun 2021 11:10:36 -0400 > > > Subject: [PATCH] btrfs-progs: include linux/const.h to fix build > > > with 5.12+ > > > @@ -21,22 +21,20 @@ exists, and is valid to include. > > > Upstream-Status: Inappropriate [mips64 + musl + libc-headers] > > > > > > Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> > > > + > > > --- > > > kerncompat.h | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/kerncompat.h b/kerncompat.h > > > -index df167fe6..254235bd 100644 > > > +index 6ca1526e..15995bb4 100644 > > > --- a/kerncompat.h > > > +++ b/kerncompat.h > > > @@ -30,6 +30,7 @@ > > > #include <linux/types.h> > > > - #include <linux/kernel.h> > > > + #include <linux/const.h> > > > #include <stdint.h> > > > +#include <linux/const.h> > > > > This patch should be removed. > > > > https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git/commit/kerncompat.h?id=b28f7bd9bba6f65258da48955154794f466b4104 > > > > I guess we actually need to backport this one: > https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 > > It should fix the issue as reported in https://github.com/kdave/btrfs-progs/pull/433 FWIW I had tried this patch again with the patch dropped as you mentioned. Cheers, Richard
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch index be942388a5..bd69bfc9cd 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch @@ -1,4 +1,4 @@ -From 3d19b0fb882c5e195362a9f0909c474e60070ca0 Mon Sep 17 00:00:00 2001 +From 1c9cc81ec72876a5351e3083552b9985eeb6c091 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@gmail.com> Date: Fri, 18 Jun 2021 11:10:36 -0400 Subject: [PATCH] btrfs-progs: include linux/const.h to fix build with 5.12+ @@ -21,22 +21,20 @@ exists, and is valid to include. Upstream-Status: Inappropriate [mips64 + musl + libc-headers] Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> + --- kerncompat.h | 1 + 1 file changed, 1 insertion(+) diff --git a/kerncompat.h b/kerncompat.h -index df167fe6..254235bd 100644 +index 6ca1526e..15995bb4 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -30,6 +30,7 @@ #include <linux/types.h> - #include <linux/kernel.h> + #include <linux/const.h> #include <stdint.h> +#include <linux/const.h> #include <features.h> --- -2.25.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb similarity index 98% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb index 3cf216724e..4c358a248b 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.15.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.16.bb @@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \ " -SRCREV = "c0ad9bde429196db7e8710ea1abfab7a2bca2e43" +SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \
Changelog: ========= - rescue: new subcommand clear-uuid-tree to fix failed mount due to bad uuid subvolume keys, caught by tree-checker - fi du: skip inaccessible files - prop: properly resolve to symlink targets - send, receive: fix crash after parent subvolume lookup errors - build: fix build on 5.12+ kernels due to changes in linux/kernel.h fix build on musl with old kernel headers - other: error handling fixes, cleanups, refactoring extent tree v2 preparatory work lots of RST documentation updates (last release with asciidoc sources), https://btrfs.readthedocs.io Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...ools-include-linux-const.h-to-fix-build-with-.patch | 10 ++++------ .../{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.15.1.bb => btrfs-tools_5.16.bb} (98%)