From owner-svn-src-all@freebsd.org  Wed Sep 23 19:15:23 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7491142394B;
 Wed, 23 Sep 2020 19:15:23 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BxSYl2RdLz4Bns;
 Wed, 23 Sep 2020 19:15:23 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 375F115833;
 Wed, 23 Sep 2020 19:15:23 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08NJFN82041989;
 Wed, 23 Sep 2020 19:15:23 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08NJFMAZ041986;
 Wed, 23 Sep 2020 19:15:22 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <202009231915.08NJFMAZ041986@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Wed, 23 Sep 2020 19:15:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r366087 - in head/stand: efi/loader i386/loader
 i386/zfsboot
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: in head/stand: efi/loader i386/loader i386/zfsboot
X-SVN-Commit-Revision: 366087
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Sep 2020 19:15:23 -0000

Author: tsoome
Date: Wed Sep 23 19:15:22 2020
New Revision: 366087
URL: https://svnweb.freebsd.org/changeset/base/366087

Log:
  loader: fix non-zfs build
  
  We can not include zfs headers while building without zfs.
  
  Reported by:	Oscar Holmlund

Modified:
  head/stand/efi/loader/main.c
  head/stand/i386/loader/main.c
  head/stand/i386/zfsboot/zfsboot.c

Modified: head/stand/efi/loader/main.c
==============================================================================
--- head/stand/efi/loader/main.c	Wed Sep 23 18:54:14 2020	(r366086)
+++ head/stand/efi/loader/main.c	Wed Sep 23 19:15:22 2020	(r366087)
@@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/boot.h>
+#ifdef EFI_ZFS_BOOT
 #include <sys/zfs_bootenv.h>
+#endif
 #include <paths.h>
 #include <stdint.h>
 #include <string.h>

Modified: head/stand/i386/loader/main.c
==============================================================================
--- head/stand/i386/loader/main.c	Wed Sep 23 18:54:14 2020	(r366086)
+++ head/stand/i386/loader/main.c	Wed Sep 23 19:15:22 2020	(r366087)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/psl.h>
 #include <sys/disk.h>
 #include <sys/reboot.h>
-#include <sys/zfs_bootenv.h>
 #include <common/drv.h>
 
 #include "bootstrap.h"
@@ -50,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "btxv86.h"
 
 #ifdef LOADER_ZFS_SUPPORT
+#include <sys/zfs_bootenv.h>
 #include "libzfs.h"
 #endif
 

Modified: head/stand/i386/zfsboot/zfsboot.c
==============================================================================
--- head/stand/i386/zfsboot/zfsboot.c	Wed Sep 23 18:54:14 2020	(r366086)
+++ head/stand/i386/zfsboot/zfsboot.c	Wed Sep 23 19:15:22 2020	(r366087)
@@ -26,7 +26,9 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <sys/reboot.h>
 #include <sys/queue.h>
+#ifdef LOADER_ZFS_SUPPORT
 #include <sys/zfs_bootenv.h>
+#endif
 
 #include <machine/bootinfo.h>
 #include <machine/elf.h>