mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-15 15:06:42 +00:00
Code Issues Releases Activity

Fix gptzfsboot for cases with GELI.

Browse Source 
HAVE_GPT isn't currently a thing, but HAVE_GELI is. Replace the former
with the latter and remove util.o from the build list (it's picked up
from libsa/libsa32, and that's OK).

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-11-21 18:03:47 +00:00
parent 3103eac6a0
commit 01dd1497ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=326069
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stand/i386/gptzfsboot/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
HAVE_GPT= yes
HAVE_GELI= yes
.include <bsd.init.mk>
@ -70,12 +70,12 @@ gptldr.out: gptldr.o
${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} gptldr.o
CLEANFILES+= gptzfsboot.bin gptzfsboot.out zfsboot.o sio.o cons.o \
drv.o gpt.o util.o ${OPENCRYPTO_XTS}
drv.o gpt.o ${OPENCRYPTO_XTS}
gptzfsboot.bin: gptzfsboot.out
${OBJCOPY} -S -O binary gptzfsboot.out ${.TARGET}
gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o \
gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o \
${OPENCRYPTO_XTS}
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBZFSBOOT} ${LIBSA32}

1
stand/i386/libi386/Makefile
View File

@ -1,6 +1,5 @@
# $FreeBSD$
HAVE_GPT= yes
HAVE_GELI= yes
.include <bsd.init.mk>