d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: fix non-zfs build

Browse Source 
We can not include zfs headers while building without zfs.

Reported by:	Oscar Holmlund
This commit is contained in:
Toomas Soome 2020-09-23 19:15:22 +00:00
parent e1c8f8f87d
commit 1dc762d4fb
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stand/efi/loader/main.c
View File

@ -36,7 +36,9 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/reboot.h> #include <sys/reboot.h>
#include <sys/boot.h> #include <sys/boot.h>
#ifdef EFI_ZFS_BOOT
#include <sys/zfs_bootenv.h> #include <sys/zfs_bootenv.h>
#endif
#include <paths.h> #include <paths.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

2
stand/i386/loader/main.c
View File

@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h> #include <machine/psl.h>
#include <sys/disk.h> #include <sys/disk.h>
#include <sys/reboot.h> #include <sys/reboot.h>
#include <sys/zfs_bootenv.h>
#include <common/drv.h> #include <common/drv.h>
#include "bootstrap.h" #include "bootstrap.h"
@ -50,6 +49,7 @@ __FBSDID("$FreeBSD$");
#include "btxv86.h" #include "btxv86.h"
#ifdef LOADER_ZFS_SUPPORT #ifdef LOADER_ZFS_SUPPORT
#include <sys/zfs_bootenv.h>
#include "libzfs.h" #include "libzfs.h"
#endif #endif

2
stand/i386/zfsboot/zfsboot.c
View File

@ -26,7 +26,9 @@ __FBSDID("$FreeBSD$");
#endif #endif
#include <sys/reboot.h> #include <sys/reboot.h>
#include <sys/queue.h> #include <sys/queue.h>
#ifdef LOADER_ZFS_SUPPORT
#include <sys/zfs_bootenv.h> #include <sys/zfs_bootenv.h>
#endif
#include <machine/bootinfo.h> #include <machine/bootinfo.h>
#include <machine/elf.h> #include <machine/elf.h>