40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
|
From b64e66feed24dd9fc008e96f0d5371b0bd0eb019 Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Sterba <dsterba@suse.cz>
|
||
|
|
Date: Thu, 30 Oct 2014 18:33:41 +0100
|
||
|
|
Subject: [PATCH 42/42] btrfs-progs: fix linking with libbtrfs
|
||
|
|
|
||
|
|
Reported at https://github.com/openSUSE/snapper/issues/128
|
||
|
|
|
||
|
|
Commit cdb9e22e292275237c added another rbtree file that defines
|
||
|
|
functions that libbtrfs uses.
|
||
|
|
|
||
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
||
|
|
---
|
||
|
|
Makefile | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 7f76447e3c55..7368502b5416 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -10,14 +10,14 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
|
||
|
|
root-tree.o dir-item.o file-item.o inode-item.o inode-map.o \
|
||
|
|
extent-cache.o extent_io.o volumes.o utils.o repair.o \
|
||
|
|
qgroup.o raid6.o free-space-cache.o list_sort.o props.o \
|
||
|
|
- ulist.o qgroup-verify.o backref.o rbtree-utils.o string-table.o
|
||
|
|
+ ulist.o qgroup-verify.o backref.o string-table.o
|
||
|
|
cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
|
||
|
|
cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
|
||
|
|
cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \
|
||
|
|
cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
|
||
|
|
cmds-property.o cmds-fi-disk_usage.o
|
||
|
|
libbtrfs_objects = send-stream.o send-utils.o rbtree.o btrfs-list.o crc32c.o \
|
||
|
|
- uuid-tree.o utils-lib.o
|
||
|
|
+ uuid-tree.o utils-lib.o rbtree-utils.o
|
||
|
|
libbtrfs_headers = send-stream.h send-utils.h send.h rbtree.h btrfs-list.h \
|
||
|
|
crc32c.h list.h kerncompat.h radix-tree.h extent-cache.h \
|
||
|
|
extent_io.h ioctl.h ctree.h btrfsck.h version.h
|
||
|
|
--
|
||
|
|
2.1.1
|
||
|
|
|