From owner-svn-soc-all@freebsd.org  Thu Jun 22 05:39:19 2017
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70F7DDA68AC
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Thu, 22 Jun 2017 05:39:19 +0000 (UTC)
 (envelope-from kneitinger@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6313B6E18C
 for <svn-soc-all@FreeBSD.org>; Thu, 22 Jun 2017 05:39:19 +0000 (UTC)
 (envelope-from kneitinger@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id v5M5dJge076496
 for <svn-soc-all@FreeBSD.org>; Thu, 22 Jun 2017 05:39:19 GMT
 (envelope-from kneitinger@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id v5M5dI53076454
 for svn-soc-all@FreeBSD.org; Thu, 22 Jun 2017 05:39:18 GMT
 (envelope-from kneitinger@FreeBSD.org)
Date: Thu, 22 Jun 2017 05:39:18 GMT
Message-Id: <201706220539.v5M5dI53076454@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 kneitinger@FreeBSD.org using -f
From: kneitinger@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r323822 - soc2017/kneitinger/libbe-head/usr.bin/be
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 05:39:19 -0000

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;