The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=4e2cbc4466d29e8198b62c37991a390c2f35f5bb

commit 4e2cbc4466d29e8198b62c37991a390c2f35f5bb
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2025-07-28 18:30:41 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2025-07-28 18:31:26 +0000

    stand/i386: Remove references to empty variable OPENCRYPTO_XTS
    
    Reviewed by:    imp
    Fixes:          4728f534ff6d ("Move LOADER_{NO,}_GELI_SUPPORT to 
MK_LOADER_GELI")
    Differential Revision:  https://reviews.freebsd.org/D51598
---
 stand/i386/gptboot/Makefile    | 4 ++--
 stand/i386/gptzfsboot/Makefile | 5 ++---
 stand/i386/isoboot/Makefile    | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile
index b91875d242f5..0f8a64529f90 100644
--- a/stand/i386/gptboot/Makefile
+++ b/stand/i386/gptboot/Makefile
@@ -53,12 +53,12 @@ gptldr.out: gptldr.o
        ${LD} ${LD_FLAGS} -e start --defsym ORG=${ORG1} -T ${LDSCRIPT} -o 
${.TARGET} gptldr.o
 
 CLEANFILES+=   gptboot.bin gptboot.out gptboot.o sio.o drv.o \
-               cons.o ${OPENCRYPTO_XTS}
+               cons.o
 
 gptboot.bin: gptboot.out
        ${OBJCOPY} -S -O binary gptboot.out ${.TARGET}
 
-gptboot.out: ${BTXCRT} gptboot.o sio.o drv.o cons.o ${OPENCRYPTO_XTS}
+gptboot.out: ${BTXCRT} gptboot.o sio.o drv.o cons.o
        ${LD} ${LD_FLAGS} --defsym ORG=${ORG2} -T ${LDSCRIPT} -o ${.TARGET} 
${.ALLSRC} ${LIBSA32}
 
 .include <bsd.prog.mk>
diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
index 1e3b51249b44..0b67ff8cdaf4 100644
--- a/stand/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
@@ -65,7 +65,7 @@ gptldr.out: gptldr.o
        ${LD} ${LD_FLAGS} -e start --defsym ORG=${ORG1} -T ${LDSCRIPT} -o 
${.TARGET} gptldr.o
 
 OBJS=  zfsboot.o sio.o cons.o bcache.o devopen.o disk.o part.o zfs_cmd.o misc.o
-CLEANFILES+=   gptzfsboot.bin gptzfsboot.out ${OBJS} ${OPENCRYPTO_XTS}
+CLEANFILES+=   gptzfsboot.bin gptzfsboot.out ${OBJS}
 
 # i386 standalone support library
 LIBI386=       ${BOOTOBJ}/i386/libi386/libi386.a
@@ -73,8 +73,7 @@ LIBI386=      ${BOOTOBJ}/i386/libi386/libi386.a
 gptzfsboot.bin: gptzfsboot.out
        ${OBJCOPY} -S -O binary gptzfsboot.out ${.TARGET}
 
-gptzfsboot.out: ${BTXCRT} ${OBJS} \
-       ${OPENCRYPTO_XTS}
+gptzfsboot.out: ${BTXCRT} ${OBJS}
        ${LD} ${LD_FLAGS} --defsym ORG=${ORG2} -T ${LDSCRIPT} -o ${.TARGET} 
${.ALLSRC} ${LIBI386} ${LIBSA32}
 
 zfsboot.o: ${ZFSSRC}/zfsimpl.c
diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile
index 7973f8029aa0..41c40a72935b 100644
--- a/stand/i386/isoboot/Makefile
+++ b/stand/i386/isoboot/Makefile
@@ -51,12 +51,12 @@ gptldr.out: gptldr.o
        ${LD} ${LD_FLAGS} -e start --defsym ORG=${ORG1} -T ${LDSCRIPT} -o 
${.TARGET} gptldr.o
 
 CLEANFILES+=   isoboot.bin isoboot.out isoboot.o sio.o drv.o \
-               cons.o ${OPENCRYPTO_XTS}
+               cons.o
 
 isoboot.bin: isoboot.out
        ${OBJCOPY} -S -O binary isoboot.out ${.TARGET}
 
-isoboot.out: ${BTXCRT} isoboot.o sio.o drv.o cons.o ${OPENCRYPTO_XTS}
+isoboot.out: ${BTXCRT} isoboot.o sio.o drv.o cons.o
        ${LD} ${LD_FLAGS} --defsym ORG=${ORG2} -T ${LDSCRIPT} -o ${.TARGET} 
${.ALLSRC} ${LIBSA32}
 
 .include <bsd.prog.mk>

Reply via email to