RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-16 09:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: build: extend convert options

Browse Source 
Add --with-convert[=VALUE] option to configure. Accepts ext2, auto, yes,
or no, but will be extended to more in the future. The configure-time
defines are not used in the code, ext2 is built-in unconditionally.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-08-23 17:21:30 +02:00
parent aa07e4be00
commit 73071f0ce4
3 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -40,6 +40,7 @@ RMDIR = @RMDIR@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@ DISABLE_DOCUMENTATION = @DISABLE_DOCUMENTATION@
DISABLE_BTRFSCONVERT = @DISABLE_BTRFSCONVERT@ DISABLE_BTRFSCONVERT = @DISABLE_BTRFSCONVERT@
BTRFSCONVERT_EXT2 = @BTRFSCONVERT_EXT2@
EXTRA_CFLAGS := EXTRA_CFLAGS :=
EXTRA_LDFLAGS := EXTRA_LDFLAGS :=
@ -166,6 +167,7 @@ endif
# external libs required by various binaries; for btrfs-foo, # external libs required by various binaries; for btrfs-foo,
# specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below # specify btrfs_foo_libs = <list of libs>; see $($(subst...)) rules below
btrfs_convert_libs = @EXT2FS_LIBS@ @COM_ERR_LIBS@ btrfs_convert_libs = @EXT2FS_LIBS@ @COM_ERR_LIBS@
btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2)
btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype
btrfs_debug_tree_objects = cmds-inspect-dump-tree.o btrfs_debug_tree_objects = cmds-inspect-dump-tree.o
btrfs_show_super_objects = cmds-inspect-dump-super.o btrfs_show_super_objects = cmds-inspect-dump-super.o

1
btrfs-convert.c
View File

@ -37,6 +37,7 @@
#include "crc32c.h" #include "crc32c.h"
#include "utils.h" #include "utils.h"
#include "task-utils.h" #include "task-utils.h"
#include <ext2fs/ext2_fs.h> #include <ext2fs/ext2_fs.h>
#include <ext2fs/ext2fs.h> #include <ext2fs/ext2fs.h>
#include <ext2fs/ext2_ext_attr.h> #include <ext2fs/ext2_ext_attr.h>

45
configure.ac
View File

@ -104,13 +104,44 @@ AC_ARG_ENABLE([convert],
AS_IF([test "x$enable_convert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1]) AS_IF([test "x$enable_convert" = xyes], [DISABLE_BTRFSCONVERT=0], [DISABLE_BTRFSCONVERT=1])
AC_SUBST([DISABLE_BTRFSCONVERT]) AC_SUBST([DISABLE_BTRFSCONVERT])
AC_ARG_WITH([convert],
AS_HELP_STRING([[[]--with-convert[[=auto]]]], [built-in filesystems for convert (default: auto)
supported (comma separated list): ext2]),
[], [with_convert=auto]
)
if test "$with_convert" = "yes"; then
with_convert=auto
fi
if test "$with_convert" = "no"; then
with_convert=
fi
convertfs=
BTRFSCONVERT_EXT2=0
if test "x$enable_convert" = xyes; then if test "x$enable_convert" = xyes; then
PKG_CHECK_MODULES(EXT2FS, [ext2fs >= 1.42],, if test "x$with_convert" = "xauto" || echo "$with_convert" | grep -q "ext2"; then
[PKG_CHECK_MODULES(EXT2FS, [ext2fs], PKG_CHECK_MODULES(EXT2FS, [ext2fs >= 1.42],,
[AC_DEFINE([HAVE_OLD_E2FSPROGS], [1], [PKG_CHECK_MODULES(EXT2FS, [ext2fs],
[E2fsprogs does not support BIGALLOC])] [AC_DEFINE([HAVE_OLD_E2FSPROGS], [1],
)]) [E2fsprogs does not support BIGALLOC])]
PKG_CHECK_MODULES(COM_ERR, [com_err]) )])
PKG_CHECK_MODULES(COM_ERR, [com_err])
convertfs="${convertfs:+$convertfs,}ext2"
BTRFSCONVERT_EXT2=1
fi
fi
AC_SUBST([BTRFSCONVERT_EXT2])
# catch typos
tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e 's/,\+/,/')
if ! test "x$tmp" = "x"; then
AC_MSG_ERROR([unknown tokens for --with-convert: $tmp])
fi
if test "$DISABLE_BTRFSCONVERT" = 0 && test "x$convertfs" = "x"; then
AC_MSG_ERROR([no filesystems for convert, use --disable-convert instead])
fi fi
AX_CHECK_DEFINE([linux/fiemap.h], [FIEMAP_EXTENT_SHARED], [], AX_CHECK_DEFINE([linux/fiemap.h], [FIEMAP_EXTENT_SHARED], [],
@ -176,7 +207,7 @@ AC_MSG_RESULT([
documentation: ${enable_documentation} documentation: ${enable_documentation}
backtrace support: ${enable_backtrace} backtrace support: ${enable_backtrace}
btrfs-convert: ${enable_convert} btrfs-convert: ${enable_convert} ${convertfs:+($convertfs)}
Type 'make' to compile. Type 'make' to compile.
]) ])