From nobody Fri Jan 13 21:24:51 2023 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 4NtvZX0QfQz2qkkt; Fri, 13 Jan 2023 21:24:52 +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 4NtvZW59kRz40mR; Fri, 13 Jan 2023 21:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645091; 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=mmSwPaaLwXQ6d7pceB5Y5Ry37fPLCMFC/ti3ez7j6ic=; b=QPRfOA2y9UGLlJoz/kos23H6Gg0eWOwPhDEY7nG+NWxB/ERs2CUUGgCHItJfIbWSA4cf6J 3Cv6TKi/DURmZOZFxmCLOgmZR42N+ZhpR/StdF2GoGmOkLK2AQdvwQ5++s462UmaKF+QU5 4SI3iGbLwMnI2beCW6P09NGlh1VCaGIyYQKxpu0C8bmXMf5Fgnr0twaFC3PsI4Q2xti9Dd 2ynz3DCCZx1qYL80CGr47jRHe+PUxtZrBGLSTfPkiRnCvDq76zvB7NAN0+O6bDYo5s89Xp LtgKJzZrtaTaHuKAAvly3D6G9NdV+dSZlnikuyGvFB5JqKLZQGa8xV2f3KhNVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645091; 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=mmSwPaaLwXQ6d7pceB5Y5Ry37fPLCMFC/ti3ez7j6ic=; b=UISptVf+ljBbo+mC+X9f/56tbCHICY1JWez39frlSvIjby1aAIFlxvNn458srjz4GSSEGe uKnbkIrEgJQVS2cvQKHXeK1jk27VUcYQoHm9h43MXDiRaECeGnmcI1UgI9dEeaLVqIxJrp pG1KgRep83hYe09u2as4R5MS3BJtLs/3p0bDB0RmATGPJ7Zpdtb5nfScjgrwyxWzPKvvUv bu+LnIC+C5lSQadl2oKUbBNRVLUrRokmQajH701MEXlcq2rGxo3fwSf3GkkXAGVYijgZ3E 8g/Q2DK/Vh4Lh1Tjopfhx1dMnRJpOAZWNIPPtEA/vs8iHS1fPLuY1dU7Mo++SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645091; a=rsa-sha256; cv=none; b=s+OKINPw4pUQGeRuYtDanklQRfGki2i/C1yfoEcuWyIvlUYwf72CWy7aBi9anI0jMbGoK8 K2Oz6NGmieTs4UpVmGVxsrThM6ZnyZ3h9fwqdDDCUQM0bQInDLXF8YCG5XhIUMEAaGLtHZ UxqSC94uvL0Pt4Vx4BaeKsyNhkxMFrPyWsACZqidzdIZkruWfoEmYU1+DaCTJevjn4F6Of 6mRsmAT2KnYxZCerB5XXKba0GiiQSn7cZ0D/XfFpvlgXFLzKUL3ZdY4oq0NelW7Pk3Z8oP ZV93BJQPiRsUOjg2Mh6bbTdRuAjAMrd2Z0zSEYaciLiT9bP9PDgvLDB7tEb1Gg== 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 4NtvZW4HDwzNBX; Fri, 13 Jan 2023 21:24:51 +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 30DLOpj0040877; Fri, 13 Jan 2023 21:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLOpj3040876; Fri, 13 Jan 2023 21:24:51 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:24:51 GMT Message-Id: <202301132124.30DLOpj3040876@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: 42e37d8caf9d - main - kboot: Add ZFS support build glue 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 42e37d8caf9da4628734f0c44c989583873b3ae6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42e37d8caf9da4628734f0c44c989583873b3ae6 commit 42e37d8caf9da4628734f0c44c989583873b3ae6 Author: Warner Losh AuthorDate: 2023-01-13 21:20:48 +0000 Commit: Warner Losh CommitDate: 2023-01-13 21:22:39 +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 --- 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"