RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: fix path to internal libbtrfsutil includes 

All files include the <btrfsutil.h> which could be confused with the
system-wide installation. Drop the -I path from build and use full path
for any libbtrfsutil headers.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-09-14 21:41:58 +02:00
parent 3df6617b9b
commit b121ac4404
7 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -95,7 +95,6 @@ CFLAGS = $(SUBST_CFLAGS) \
-fno-strict-aliasing \ -fno-strict-aliasing \
-fPIC \ -fPIC \
-I$(TOPDIR) \ -I$(TOPDIR) \
-I$(TOPDIR)/libbtrfsutil \
$(CRYPTO_CFLAGS) \ $(CRYPTO_CFLAGS) \
-DCOMPRESSION_LZO=$(COMPRESSION_LZO) \ -DCOMPRESSION_LZO=$(COMPRESSION_LZO) \
-DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \ -DCOMPRESSION_ZSTD=$(COMPRESSION_ZSTD) \

2
cmds/filesystem.c
View File

@ -29,7 +29,7 @@
#include <getopt.h> #include <getopt.h>
#include <limits.h> #include <limits.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <btrfsutil.h> #include "libbtrfsutil/btrfsutil.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "kernel-shared/volumes.h" #include "kernel-shared/volumes.h"
#include "kernel-lib/list_sort.h" #include "kernel-lib/list_sort.h"

2
cmds/property.c
View File

@ -23,7 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <btrfsutil.h> #include "libbtrfsutil/btrfsutil.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "common/open-utils.h" #include "common/open-utils.h"
#include "common/utils.h" #include "common/utils.h"

2
cmds/qgroup.c
View File

@ -20,7 +20,7 @@
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <btrfsutil.h> #include "libbtrfsutil/btrfsutil.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "common/open-utils.h" #include "common/open-utils.h"
#include "common/utils.h" #include "common/utils.h"

2
cmds/receive.c
View File

@ -46,6 +46,7 @@
#if COMPRESSION_ZSTD #if COMPRESSION_ZSTD
#include <zstd.h> #include <zstd.h>
#endif #endif
#include "libbtrfsutil/stubs.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "kernel-lib/list.h" #include "kernel-lib/list.h"
#include "kernel-shared/send.h" #include "kernel-shared/send.h"
@ -56,7 +57,6 @@
#include "common/path-utils.h" #include "common/path-utils.h"
#include "cmds/commands.h" #include "cmds/commands.h"
#include "cmds/receive-dump.h" #include "cmds/receive-dump.h"
#include "stubs.h"
#include "ioctl.h" #include "ioctl.h"
struct btrfs_receive struct btrfs_receive

2
cmds/subvolume.c
View File

@ -28,7 +28,7 @@
#include <limits.h> #include <limits.h>
#include <getopt.h> #include <getopt.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <btrfsutil.h> #include "libbtrfsutil/btrfsutil.h"
#include "cmds/qgroup.h" #include "cmds/qgroup.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "common/utils.h" #include "common/utils.h"

2
common/utils.c
View File

@ -37,7 +37,7 @@
#include <getopt.h> #include <getopt.h>
#include <blkid/blkid.h> #include <blkid/blkid.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
#include <btrfsutil.h> #include "libbtrfsutil/btrfsutil.h"
#include "kernel-lib/radix-tree.h" #include "kernel-lib/radix-tree.h"
#include "kernel-shared/ctree.h" #include "kernel-shared/ctree.h"
#include "kernel-shared/disk-io.h" #include "kernel-shared/disk-io.h"