jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 00:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand: fix build userboot without zfs

Browse Source 
Fix regression in building userboot -DWITHOUT_LOADER_ZFS

Fixes: e307eb94ae
MFC After: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/665
Approved by: re@ (cperciva)

(cherry picked from commit 4d59545d0c)
(cherry picked from commit 3464fc5f2a)
This commit is contained in:
Michael Paepcke 2023-02-27 19:58:03 -07:00 committed by Warner Losh
parent b4eb5f81ee
commit 572900bd93
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stand/userboot/userboot/Makefile
View File

@ -36,9 +36,13 @@ SRCS+= gfx_fb_stub.c
CFLAGS+= -Wall
CFLAGS+= -I${BOOTSRC}/userboot
.if ${MK_LOADER_ZFS} != "no"
CFLAGS.main.c+= -I${BOOTSRC}/libsa/zfs
CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include
CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
.endif
CWARNFLAGS.main.c += -Wno-implicit-function-declaration
CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken

2
stand/userboot/userboot/main.c
View File

@ -32,13 +32,13 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <setjmp.h>
#include <sys/disk.h>
#include <sys/zfs_bootenv.h>
#include "bootstrap.h"
#include "disk.h"
#include "libuserboot.h"
#if defined(USERBOOT_ZFS_SUPPORT)
#include <sys/zfs_bootenv.h>
#include "libzfs.h"
static void userboot_zfs_probe(void);