Date: Wed, 23 Sep 2020 19:15:22 +0000 (UTC) From: Toomas Soome <tsoome@FreeBSD.org> 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 Message-ID: <202009231915.08NJFMAZ041986@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009231915.08NJFMAZ041986>