diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-07-28 07:30:44 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-02 11:29:57 +0100 |
| commit | f2617ecc93048a29e37d4213e08ddbd997139f6c (patch) | |
| tree | f27c172a616e498a2bbe51ba53028442595f67de /meta/recipes-devtools/btrfs-tools | |
| parent | 339055f5abc30ea5dc26184c94a2da39ed46a22f (diff) | |
| download | openembedded-core-f2617ecc93048a29e37d4213e08ddbd997139f6c.tar.gz | |
btrfs-tools: Use linux/mount.h instead of sys/mount.h
This fixes the conflict thats with mount.h from glibc 2.36+ and kernel
[1]
[1] https://sourceware.org/glibc/wiki/Release/2.36
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch new file mode 100644 index 0000000000..1397e50b30 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch @@ -0,0 +1,32 @@ +From d9f118a3408a8a2530f0f60e8072f4323911530f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 27 Jul 2022 01:08:20 +0000 +Subject: [PATCH] device-utils.c: Use linux mount.h instead of sys/mount.h + +This file includes linucx/fs.h which includes linux/mount.h and with +glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1] +therefore try to avoid including both headers + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Upstream-Status: Submitted [https://www.spinics.net/lists/linux-btrfs/msg126918.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common/device-utils.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/common/device-utils.c b/common/device-utils.c +index 617b6746..25a4fb8c 100644 +--- a/common/device-utils.c ++++ b/common/device-utils.c +@@ -15,7 +15,6 @@ + */ + + #include <sys/ioctl.h> +-#include <sys/mount.h> + #include <sys/statfs.h> + #include <sys/types.h> + #include <stdio.h> +-- +2.25.1 + diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb index 816fc17ae1..5b24bef5cd 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb @@ -17,6 +17,7 @@ DEPENDS = "util-linux zlib" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ + file://0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch \ " SRCREV = "47b5cf867fc37411ef51eb5c09893a95f7f6c3b7" S = "${WORKDIR}/git" |