From nobody Mon Jul 28 18:31:49 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4brRs24Ll2z63M50; Mon, 28 Jul 2025 18:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brRs20P5zz3qLG; Mon, 28 Jul 2025 18:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753727510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ub9Puxfq/Ndtje9iZ2UPZhEGhEZtJCAr+P6ETfpT9sM=; b=tleUUs8fNpTOQuhiNS7rEkb91y1Is1uQ9Fgbq87pxwqGdpYq13/nrAwXG0WLfcQNeCyVVG vE1Tf8cb+I8OzjU4zWqIBStHUnziViCBoLsaiPLSLwK6z//roqnGo3grAvZHUh6q37AXk1 No9zmH2/cZ84QvKkPIcvLN65YqyF4PmSNLKNt9wkRquogDqLlBSPPFkRBM8HQcgkgtB1zP bLqT3wMb/RdrC4LY367oVD5CI3CrsfjlQ5hXEnm3lIJRnLWituz906bksPuYGc573/Hu9a U6Ewo2ki0GW95hN+u0XdE7vp1iS7YJH/elr4a/yi/lHBDMEpWM358dR6pbBU6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753727510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ub9Puxfq/Ndtje9iZ2UPZhEGhEZtJCAr+P6ETfpT9sM=; b=JFq33miqA6MOlDggjTFKGSJytl2tN1gkYlkmICuEWnDeENY6exv6BPPRTKA5FDLKDkfjoC oS9Jz1GL57FMirbwUuxoTGCLOFrxrrd7eErmLb3/DnFA0R260m2acmXWn1J3gAfbhmW0FX NExy1uMgXwiBskvYo7vyTv9zQfWVpJskITS89cuBriwZMzC08jFCvH7XRR3lqCghrMAtpO JlqRH4Rtggmf/VJTPbs5FW5hxe+SmtbA+PomZdG06MluaH532HtzyB713L+vxjZeedYWVr m47JLCg2PuCqnBMAEcS+KRfXg8q/NubF8gavvkqJe0FWvaATnEWVrr3AHvDH6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753727510; a=rsa-sha256; cv=none; b=q3welHTBNr63pBV7wTpDh1mZs5n74p+/5eei4NXG6/q8Yedqx7aWEeL57I1y1Weg9viIjl rZS/zj2HlSn+35hWZft32iIa/YhjPMXU8PUHuv5hH9WYqPr/oqT6YLgDWrhvogKef7ZhRN JDnYtMvlqpz6l3xbyQh90iBlD9g52LxYbpo6WZcmRM2Kwwk4pJImOK8l1Upt597ACw1EUl 5gKGa2XjNC1Co+q9AbI5ehs0xAeb1qxhHZOYpxpQN9/c4FhBB1ULUzJjWg4BLHyV5hsJOj iuFmsU5sFmAr6/v+VEn+zEcmbWe6cG/GzmSOFqC8wkMZa+IqVgu4V+lj4vIfJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brRs16YmHzwgs; Mon, 28 Jul 2025 18:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56SIVnct051435; Mon, 28 Jul 2025 18:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SIVnJv051431; Mon, 28 Jul 2025 18:31:49 GMT (envelope-from git) Date: Mon, 28 Jul 2025 18:31:49 GMT Message-Id: <202507281831.56SIVnJv051431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 4e2cbc4466d2 - main - stand/i386: Remove references to empty variable OPENCRYPTO_XTS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e2cbc4466d29e8198b62c37991a390c2f35f5bb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4e2cbc4466d29e8198b62c37991a390c2f35f5bb commit 4e2cbc4466d29e8198b62c37991a390c2f35f5bb Author: John Baldwin AuthorDate: 2025-07-28 18:30:41 +0000 Commit: John Baldwin 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 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