From nobody Tue Jan 24 22:10:46 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 4P1h4Q3S5Dz3bf6Y; Tue, 24 Jan 2023 22:10:46 +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 4P1h4Q2bx3z4LdW; Tue, 24 Jan 2023 22:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598246; 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=1xvwxo6Qj3jPDdZUquC+1feccjCOfNNIWx94dBiv5K8=; b=wq2KcAkyjbVPf4vyfO7yGO3ZaTeXkHfey2Yi1ZvbPgTMB7VQ1SAQC2dIRN0hYI3Bb47H4O VB7/7H0P9VWdyCv3MWlUiAN+Qeoc4GiJQ78hd+3D0v7Ar8LKDYRLhlWMOGwdHrW6nMacw3 kdagdxGKdW3zAK8Qj+Dm377zHGgU4ZY0YeHz3d1YaWRPvZ4nTdliq7nT61d/lR0Cll+KUz xgrOrgdAccIV6j8xLN+kvzFhCpf2M/A5xMI9VkgSgc1x02N+PW9XoQEnVV7/NXambENqU+ Duldpl4VoLoDYqBFzNgHlVaDV+EVm0ByjEi3rsT0HaA3g7NNrcwtJatfk62n8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598246; 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=1xvwxo6Qj3jPDdZUquC+1feccjCOfNNIWx94dBiv5K8=; b=A6GEwF7kZ8eRTTeBEy0C+b0i0xoUq/H0uVvjFhTM0vqhDIFTp40rYt9RhWgmDD8kGUriVU ap38u3cCBaEcGwmHVOErV/8oPGgBSNUYx6mQRACqkRXT/bBqFWGPEp/EKyLV+GLMVNPeCA m7HxQ/bZGvun4IyIWKlrcnKtwfmBaaLWWYDNOIn4nFJzCBf/WMHQQDBD84RAUrHHgYSfbm +kayZh1OROq0PsMhLHSUN3Zi+QSFc5cq8Kw0mtIqciAKPQB3mAPABS/wRpb1cuMeSLvI+K 8LsyVq/uaFQ/IMl86354iyYyj0qYpSWP6+zYhC6HhXOXB8duH/A6XebXsRVfrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598246; a=rsa-sha256; cv=none; b=wiWIa4/4PsboVXmUWN/7rHeCpagnx5J0o4YYzTVe+ZwiFIrmlmqsih9++IX33hlJHlO25B qyyeCMHLY10OVYRjxhTwX0mb+V+Do+w/1E8wsLGo/lmM6x7Imzd45W/ZIcOmdyu2i4QqNs gpHfT5e4aqz9Yl3zQ5REmLafrWvolVJz/rGGIAhc+gR9ZUBw6foJW6IUJrFdq9jFPBfkWM DKKoIgJW157Tt20+tzHKE2kNaBkR+Eb0AksIVxX0E5HfB5f2UtZHqF8oz8IqcN8kk3A3dv MnWfLqEXe53kzhAnt42HsRLZf+oKtghiEtTUn9VyJN8VTXvq44Wkcix1yE0Qxw== 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 4P1h4Q1jZDzQM0; Tue, 24 Jan 2023 22:10:46 +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 30OMAksp080507; Tue, 24 Jan 2023 22:10:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAk6O080506; Tue, 24 Jan 2023 22:10:46 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:46 GMT Message-Id: <202301242210.30OMAk6O080506@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: f05568d2cae6 - stable/13 - stand: For ZFS build, add new directory 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f05568d2cae620d15af9269ad0e2ac953c1c4449 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f05568d2cae620d15af9269ad0e2ac953c1c4449 commit f05568d2cae620d15af9269ad0e2ac953c1c4449 Author: Warner Losh AuthorDate: 2022-07-08 23:34:23 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:23 +0000 stand: For ZFS build, add new directory OpenZFS is based on having a number of layers of include files that define things and include the next layer. Insert a later at the start for files in libsa/zfs/spl so we can override issues with upstream OpenZFS while we work to get the issues corrected upstream. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D35750 (cherry picked from commit 87d3aa53973fdfe1fa2ea64a8da9e29f4142d5af) --- stand/libsa/zfs/Makefile.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index b503f6d20e86..f0d8129be9e1 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -13,7 +13,8 @@ CFLAGS+= -I${LDRSRC} CFLAGS+= -I${SYSDIR}/cddl/boot/zfs CFLAGS+= -I${SYSDIR}/crypto/skein -ZFS_EARLY= -I${ZFSOSINC} \ +ZFS_EARLY= -I${ZFSSRC}/spl \ + -I${ZFSOSINC} \ -I${ZFSOSINC}/spl \ -I${ZFSOSINC}/zfs