From: Julien_N <noblet_julien@orange.fr>
To: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs-progs: build: add missing symbols to libbtrfs - new patch
Date: Wed, 23 Oct 2019 17:44:32 +0200 [thread overview]
Message-ID: <41f818a8-a359-a21a-6490-94ce1cbfe16a@orange.fr> (raw)
In-Reply-To: <3c3f25e4-7f36-b1f3-0e82-9745e0eb84cb@orange.fr>
After testing with ldd tool, there is some other stuff to add:
(please apply those 2 patchs)
---
Makefile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 616d469a..edab7fff 100644
--- a/Makefile
+++ b/Makefile
@@ -149,19 +149,17 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o
cmds/device.o cmds/scrub.o \
cmds/property.o cmds/filesystem-usage.o
cmds/inspect-dump-tree.o \
cmds/inspect-dump-super.o cmds/inspect-tree-stats.o
cmds/filesystem-du.o \
mkfs/common.o check/mode-common.o check/mode-lowmem.o
-libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o
btrfs-list.o \
- kernel-lib/radix-tree.o extent-cache.o extent_io.o ctree.o
volumes.o \
- disk-io.o extent-tree.o delayed-ref.o print-tree.o
common/device-scan.o \
- common/utils.o free-space-cache.o common/path-utils.o
root-tree.o \
- transaction.o file-item.o kernel-lib/raid56.o
kernel-lib/tables.o \
- kernel-lib/crc32c.o common/messages.o \
- uuid-tree.o utils-lib.o common/rbtree-utils.o
+libbtrfs_objects = $(objects) send-stream.o send-utils.o
kernel-lib/rbtree.o btrfs-list.o \
+ kernel-lib/radix-tree.o extent-cache.o extent_io.o \
+ kernel-lib/crc32c.o common/messages.o libbtrfsutil/errors.o \
+ uuid-tree.o utils-lib.o common/rbtree-utils.o
libbtrfsutil/subvolume.o
libbtrfs_headers = send-stream.h send-utils.h send.h
kernel-lib/rbtree.h btrfs-list.h \
kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h \
volumes.h disk-io.h delayed-ref.h print-tree.h
free-space-cache.h \
- common/device-scan.h common/utils.h
common/path-utils.h transaction.h
+ common/device-scan.h common/utils.h
common/path-utils.h transaction.h \
+ libbtrfsutil/btrfsutil.h
libbtrfsutil_major := $(shell sed -rn 's/^\#define
BTRFS_UTIL_VERSION_MAJOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
libbtrfsutil_minor := $(shell sed -rn 's/^\#define
BTRFS_UTIL_VERSION_MINOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
libbtrfsutil_patch := $(shell sed -rn 's/^\#define
BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
--
2.23.0
I think also libbtrfsutil/subvolume.o and libbtrfsutil/errors.o have to
be moved to common/ ...
Le 23/10/2019 à 16:47, Julien_N a écrit :
> According to Johannes Thumshirn, there are missing some symbols in libbtrfs.
>
> I've made that patch, it seem to work with snapper.
>
> $ snapper --version
> snapper 0.8.4
> flags btrfs,lvm,ext4,xattrs,rollback,btrfs-quota,no-selinux
>
>
> BR.
>
> Julien
>
>
> ---
> Makefile | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 21bf2717..616d469a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -150,13 +150,18 @@ cmds_objects = cmds/subvolume.o cmds/filesystem.o
> cmds/device.o cmds/scrub.o \
> cmds/inspect-dump-super.o cmds/inspect-tree-stats.o
> cmds/filesystem-du.o \
> mkfs/common.o check/mode-common.o check/mode-lowmem.o
> libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o
> btrfs-list.o \
> - kernel-lib/radix-tree.o extent-cache.o extent_io.o \
> + kernel-lib/radix-tree.o extent-cache.o extent_io.o ctree.o
> volumes.o \
> + disk-io.o extent-tree.o delayed-ref.o print-tree.o
> common/device-scan.o \
> + common/utils.o free-space-cache.o common/path-utils.o
> root-tree.o \
> + transaction.o file-item.o kernel-lib/raid56.o
> kernel-lib/tables.o \
> kernel-lib/crc32c.o common/messages.o \
> uuid-tree.o utils-lib.o common/rbtree-utils.o
> libbtrfs_headers = send-stream.h send-utils.h send.h
> kernel-lib/rbtree.h btrfs-list.h \
> kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \
> kernel-lib/radix-tree.h kernel-lib/sizes.h kernel-lib/raid56.h \
> - extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h
> + extent-cache.h extent_io.h ioctl.h ctree.h btrfsck.h version.h \
> + volumes.h disk-io.h delayed-ref.h print-tree.h
> free-space-cache.h \
> + common/device-scan.h common/utils.h
> common/path-utils.h transaction.h
> libbtrfsutil_major := $(shell sed -rn 's/^\#define
> BTRFS_UTIL_VERSION_MAJOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
> libbtrfsutil_minor := $(shell sed -rn 's/^\#define
> BTRFS_UTIL_VERSION_MINOR ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
> libbtrfsutil_patch := $(shell sed -rn 's/^\#define
> BTRFS_UTIL_VERSION_PATCH ([0-9])+$$/\1/p' libbtrfsutil/btrfsutil.h)
next prev parent reply other threads:[~2019-10-23 15:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 14:47 [PATCH] btrfs-progs: build: add missing symbols to libbtrfs - new patch Julien_N
2019-10-23 15:44 ` Julien_N [this message]
2019-10-23 17:07 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=41f818a8-a359-a21a-6490-94ce1cbfe16a@orange.fr \
--to=noblet_julien@orange.fr \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).