Date: Thu, 22 Jun 2017 05:39:18 GMT From: kneitinger@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r323822 - soc2017/kneitinger/libbe-head/usr.bin/be Message-ID: <201706220539.v5M5dI53076454@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kneitinger Date: Thu Jun 22 05:39:17 2017 New Revision: 323822 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=323822 Log: Correct zfs dependency includes for be command Modified: soc2017/kneitinger/libbe-head/usr.bin/be/Makefile soc2017/kneitinger/libbe-head/usr.bin/be/be.c Modified: soc2017/kneitinger/libbe-head/usr.bin/be/Makefile ============================================================================== --- soc2017/kneitinger/libbe-head/usr.bin/be/Makefile Thu Jun 22 05:16:00 2017 (r323821) +++ soc2017/kneitinger/libbe-head/usr.bin/be/Makefile Thu Jun 22 05:39:17 2017 (r323822) @@ -4,9 +4,20 @@ WARNS?= 1 MAN= be.1 -LIBADD= be -LIBADD= zfs -LIBADD= nvpair +LIBADD+= be +LIBADD+= zfs +LIBADD+= nvpair + +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -DNEED_SOLARIS_BOOLEAN Modified: soc2017/kneitinger/libbe-head/usr.bin/be/be.c ============================================================================== --- soc2017/kneitinger/libbe-head/usr.bin/be/be.c Thu Jun 22 05:16:00 2017 (r323821) +++ soc2017/kneitinger/libbe-head/usr.bin/be/be.c Thu Jun 22 05:39:17 2017 (r323822) @@ -33,6 +33,8 @@ #include <sysexits.h> #include <unistd.h> +#include <be.h> + static int be_activate(int argc, char *argv[]); static int be_create(int argc, char *argv[]); static int be_destroy(int argc, char *argv[]); @@ -149,12 +151,12 @@ char *bootenv; char *snapshot; - existing = NULL; + existing = NULL; recursive = false; while ((opt = getopt(argc, argv, "re:")) != -1) { switch (opt) { case 'e': - existing = optarg; + existing = optarg; break; case 'r': recursive = true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706220539.v5M5dI53076454>