From nobody Tue Jan 24 22:14:31 2023 X-Original-To: dev-commits-src-branches@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 4P1h8m1XqRz3bgy8; Tue, 24 Jan 2023 22:14:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h8l6Cq0z3Lhy; Tue, 24 Jan 2023 22:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598471; 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=ODqaq0i+hGf3z16ZAD+wTHKKLh9JVj7NvsUYwoAT9vw=; b=iX436xMl5dBlKlcnbP/oHMvQma1b3GofJ+cEKthClo2OBBaHEdf9lDmEtiJXgOqdFjcAAo DFR8JW/1NFMXhPon+T+gx1ZVqo3F8+mBiS/BdzG8hwo72a3fFSVksvcQa81j5exqqO0S6W LOEadEooEiAolI44+CU2F7Y7CpYGUMD9shkV5xRO5dZKbg+Ctr+0uR58cPz4BZ6+PMFCFm wB0niOZo3wDSDEU6HMy5pjEnf346lrk0JEuJ3ia1JhTAYZSw9w70Q0yOoKu06NZHgJCQuT IEVzmEBTNvR4w9ZPuAIdEcNXpQzX7jVrWYq+hOkySUqfbmxBhSWTuc5LuDv0Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598471; 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=ODqaq0i+hGf3z16ZAD+wTHKKLh9JVj7NvsUYwoAT9vw=; b=M9Z9zk06RT6UoRNTUvaoBUybOmI8zBg0P2GR8Dx9YLLHMe0la235V6yS267QeWWtbpMPq+ FdKUZ3E6Wt0acfg7qr5cF2PS9L9/8priAzHV7+R+DdS8tUYC0eiYLooJ7Tz1xTQPsLdLkN GWPxyM4nEpY3kPLoFwdw8GoL+rEBMoqimLUBteZ1qvlieGWUCZA8CSSkh1gmdb9xiWPzgY wIM6pVW/riYs55f4hlocjlBdrHUHHSWHEjjVRpE/eHjAtZz7hlURfd5BLZzkzywMdPebo3 Ev2kzdE9j1WQFfWg9n4KQQdN3er+nZXAGp/69gbTxzYS+Z1QMNjFOS3YfnDA6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598471; a=rsa-sha256; cv=none; b=as553W8J3aq+eKPdUt6ELI8GccYCOacm99+l+JWkupiHTUCS4/NDLKaC2CSzoWB5iJR8W0 91X4m+MKe+7nkXnnHzFyFKtuuf/6V9JqC1ezwoh026g+Z9AIyICAh59hYQ9JWoikEQmTdV EdfCpvjbbmNB2ekUSWPWFsXuNKgV6mgdsn6wNmm9K3lomoEk+06L92Hvi9fBEKVxHQaTQf DAZUhtrCSWrQpNrxhR0xuqR8LC9Pkno3uuXKH4P8uaKhNPSodm94hYNWsltXVSRc3OKaEo nwjsUSE5m6+22FfJdkiywCCBz9g0T0/HMpXHAU0bmzE2NHJs5kFcWed7saxxWQ== 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 4P1h8l5KB9zQfh; Tue, 24 Jan 2023 22:14:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMEVVL089945; Tue, 24 Jan 2023 22:14:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMEVr4089944; Tue, 24 Jan 2023 22:14:31 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:14:31 GMT Message-Id: <202301242214.30OMEVr4089944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d11df0599d9d - stable/13 - kboot: Add ZFS support build glue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d11df0599d9de9404bae4517440856dd7c0eee7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d11df0599d9de9404bae4517440856dd7c0eee7d commit d11df0599d9de9404bae4517440856dd7c0eee7d Author: Warner Losh AuthorDate: 2023-01-13 21:20:48 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:47 +0000 kboot: Add ZFS support build glue Now that all the pieces are in place, allow kboot to be built with ZFS support. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D38009 (cherry picked from commit 42e37d8caf9da4628734f0c44c989583873b3ae6) --- stand/kboot/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stand/kboot/Makefile b/stand/kboot/Makefile index 5fe444cdf8c5..35d71cb064fc 100644 --- a/stand/kboot/Makefile +++ b/stand/kboot/Makefile @@ -5,6 +5,7 @@ LOADER_CD9660_SUPPORT?= yes LOADER_MSDOS_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes +LOADER_ZFS_SUPPORT?= yes LOADER_NET_SUPPORT?= no LOADER_NFS_SUPPORT?= no LOADER_TFTP_SUPPORT?= no @@ -34,6 +35,12 @@ SRCS= \ vers.c CFLAGS.gfx_fb_stub.c += -I${SRCTOP}/contrib/pnglite -I${SRCTOP}/sys/teken +.if ${MK_LOADER_ZFS} != "no" +CFLAGS+= -I${ZFSSRC} +CFLAGS+= -I${SYSDIR}/contrib/openzfs/include +CFLAGS+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs +HAVE_ZFS=yes +.endif .include "${BOOTSRC}/fdt.mk"