From nobody Tue Aug 06 23:30:30 2024 X-Original-To: dev-commits-src-all@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 4WdqKy3Rswz5S8Sm; Tue, 06 Aug 2024 23:30:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WdqKy21h3z4m9X; Tue, 6 Aug 2024 23:30:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722987030; 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=Spwqf3ZxdWBZJAMmBo6pIU0nqsQd7DOvY8xA/YK7W5M=; b=ES/dC/WMR5iB61oGVTyAK5d9OdExA60D0l8X1+3dxZyg1k6rEKXqE2sQLbG/N6hXusunN+ Bh5oI2Gtf6x9yJclOY1quWIRQnbX9pYxIEumEKBUSRF/f4Y3RiakM3TR1k6ONx2x6A5yb9 7TPG6dBFFb8CxUj8CLnakOjIK4UkNYOOlu6Dm+qzkPXNmi/9B5yY4WZeMgDf58/LjbvU7j C+2/nyMPZ6277ndi1/PP0IaQKT+N9UlFLlFnDI4OGz10khiv5AqzPlCkcTlehdafYy3Qat TBuroP4cBEa3LLdcLjaPUx0xSupDVNdwb9pvdg+4cId3qqdlY250FphtvuG+aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722987030; a=rsa-sha256; cv=none; b=Tk5HRFhTaY93EshtFGZd/TnULMwiAv3xIcS7vwrO1EKYwf1tNkB0NvCwTN7Xs0nXhW4q1o AklGJVmgXjeXyRAq0eBwpI01xyQyw7/QA2ffCKH7q05vkgCQkdHMLyd0t8mVEimIh7MRL7 p82dN2lHFxq+n8Tb5NQiIFJCwTTzG0OCjeV0sSeNNcMrAqhzw+rzI67SJBJ3dJmppQ2Z5C ImnLEqWiLl4ohqEzZxv6b/0AThaN0JUnwf64afSxr+hu9GET8t6jjE/SuEgJatfzrjS8et OU5/uqZ8ARpskvVRVXYqPydMXeA4ND+uBhxLPAOQGzlzthR7RLi4P0cqTPqiGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722987030; 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=Spwqf3ZxdWBZJAMmBo6pIU0nqsQd7DOvY8xA/YK7W5M=; b=rYS/5Z+Go61g2Etm1fBnHMSQa3bwSc5//d+0puzshcLf9S4Pz0VW2Xs3HeQPv/fdk85yJ2 dx/r11UqSujGlvMUQdYvKap4yK0/DBOBLObBfM9b3uc73039AxkmjYhtwRhTvYNosjLm// lhZgOpV4EbuLwnmZvGfbWA4Oe7swYCDMKo5s9hLivOGW1PbJ8NjKmw02bvegWZvHvUoWmq aIG+1FbGUpaLdIHl7D79xJSzKb/d9epe5sBWzdUIqrhCCzllUkIDtDyjwSFq1TnVFFS2cQ olSepJkb2teHDTW0AxMAZAzVkgxB/vSf4nKnrfDOrAgXhXDT8BbwJAgR/mi28w== 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 4WdqKy1HbQzRQw; Tue, 6 Aug 2024 23:30:30 +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 476NUU7F080885; Tue, 6 Aug 2024 23:30:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 476NUUmQ080882; Tue, 6 Aug 2024 23:30:30 GMT (envelope-from git) Date: Tue, 6 Aug 2024 23:30:30 GMT Message-Id: <202408062330.476NUUmQ080882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f4762e9135d1 - main - pxeboot: Allow a different default loader for pxeboot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4762e9135d181f5d4f2a9d688ff803ee53ad808 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4762e9135d181f5d4f2a9d688ff803ee53ad808 commit f4762e9135d181f5d4f2a9d688ff803ee53ad808 Author: Warner Losh AuthorDate: 2024-08-05 21:19:29 +0000 Commit: Warner Losh CommitDate: 2024-08-06 23:22:36 +0000 pxeboot: Allow a different default loader for pxeboot Sometimes you need / want a different boot loader than loader_lua for pkeldr. Provide an option to get either the 4th one or the simp one. MFC After: 3 days Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46213 --- stand/i386/Makefile | 7 ++++++- stand/i386/pxeldr/Makefile | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stand/i386/Makefile b/stand/i386/Makefile index f9aedcc3a008..768496598575 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -20,6 +20,11 @@ SUBDIR.${MK_LOADER_PXEBOOT}+= pxeldr SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot -SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP} +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else +L=${LOADER_DEFAULT_INTERP} +.endif +SUBDIR_DEPEND_pxeldr+= loader_${L} .include diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index a303aff413a8..bec2a27af47a 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -22,7 +22,11 @@ CFLAGS+=-DALWAYS_SERIAL CFLAGS+=-I${BOOTSRC}/i386/common +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else L=${LOADER_DEFAULT_INTERP} +.endif LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin CLEANFILES+= ${BOOT}.tmp