Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replication functionality check-in. #4

Merged
merged 16 commits into from
Mar 7, 2018
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ install:
make --no-print-directory -s pkg-utils pkg-kmod;
sudo dpkg -i *.deb;
fi
- cd ../ZoL
- cd ../zfs
- sh autogen.sh
- if [ $ZFS_BUILD_TAGS = 0 ]; then
if [ $TRAVIS_BRANCH = "zfs-0.7-release" ]; then
Expand Down
3 changes: 2 additions & 1 deletion cmd/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SUBDIRS = zfs zpool zdb zhack zinject zstreamdump ztest uzfs_test zpios
SUBDIRS = zfs zpool zdb zhack zinject zstreamdump ztest zrepl uzfs_test zpios
SUBDIRS += mount_zfs fsck_zfs zvol_id vdev_id arcstat dbufstat zed
SUBDIRS += arc_summary raidz_test zgenhostid tgt dmu_io_test

22 changes: 22 additions & 0 deletions cmd/zrepl/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
include $(top_srcdir)/config/Rules.am

# -Wnoformat-truncation to get rid of compiler warning for unchecked
# truncating snprintfs on gcc 7.1.1.
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(NO_FORMAT_TRUNCATION)
AM_CPPFLAGS += -DDEBUG

DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include

sbin_PROGRAMS = zrepl

zrepl_SOURCES = \
zrepl.c

zrepl_LDADD = \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la \
$(top_builddir)/lib/libzfs_core/libzfs_core.la
Loading