svn commit: r326069 - in head/stand/i386: gptzfsboot libi386

[Warner Losh]

Author: imp
Date: Tue Nov 21 18:03:47 2017
New Revision: 326069
URL: https://svnweb.freebsd.org/changeset/base/326069

Log:
  Fix gptzfsboot for cases with GELI.
  
  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

Modified:
  head/stand/i386/gptzfsboot/Makefile
  head/stand/i386/libi386/Makefile

Modified: head/stand/i386/gptzfsboot/Makefile
==============================================================================
--- head/stand/i386/gptzfsboot/Makefile	Tue Nov 21 18:02:18 2017	(r326068)
+++ head/stand/i386/gptzfsboot/Makefile	Tue Nov 21 18:03:47 2017	(r326069)
@@ -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}
 

Modified: head/stand/i386/libi386/Makefile
==============================================================================
--- head/stand/i386/libi386/Makefile	Tue Nov 21 18:02:18 2017	(r326068)
+++ head/stand/i386/libi386/Makefile	Tue Nov 21 18:03:47 2017	(r326069)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-HAVE_GPT=		yes
 HAVE_GELI=		yes
 
 .include <bsd.init.mk>