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 <[email protected]>
> ---
>  ...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 <[email protected]>
>  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 <[email protected]>
> +
>  ---
>   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 (#160665): 
https://lists.openembedded.org/g/openembedded-core/message/160665
Mute This Topic: https://lists.openembedded.org/mt/88484706/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to