From nobody Sat Jul 09 05:03:27 2022 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 900F63E57EF; Sat, 9 Jul 2022 05:03:28 +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 4Lfyhw1Kzbz3MrC; Sat, 9 Jul 2022 05:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343008; 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=gknrN8c2hD81OJQPMQYks1fvV+r9QRsx1DxQ56OljdM=; b=vYWn/mNdEqptogoVjHPY67oRq2DWC7DRvrCpV/pgImCnKSpCenUi5jLwb3Flkz+mLE4mwD JkgHYCoZidSnLO/WUGZ49adshscwDF0oWAqTnnjOnQViP/wjRyGFZ0mygFue7wR21GzQ5F CyT+fay12+tJJ4deSnQsO3SACxGXLckFKNnEm7fbzxGxZ7THAujb2qFuhWfmFqUkpEZJ2i L5dLIAFsGYPVF51dMnpa+9BDlmpeG1TTN24cD7jYzXRGB4hlX6ms6ThNlEb7oW6E7MYZ9R khWfgbbv1dHGcMmvHRLjJiyOeHdgiW/wADlY1tyjYNpEzsQpN6ZYDQrxmJJEtQ== 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 4Lfyhw0NLLzZJQ; Sat, 9 Jul 2022 05:03:28 +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 26953RR2099905; Sat, 9 Jul 2022 05:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26953REk099904; Sat, 9 Jul 2022 05:03:27 GMT (envelope-from git) Date: Sat, 9 Jul 2022 05:03:27 GMT Message-Id: <202207090503.26953REk099904@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: 87d3aa53973f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 87d3aa53973fdfe1fa2ea64a8da9e29f4142d5af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657343008; 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=gknrN8c2hD81OJQPMQYks1fvV+r9QRsx1DxQ56OljdM=; b=n3nyUSigls8zsX8xv6dB8+t4RBGUNA41+xOnYK4jzgeVfZ9rJwSmlLOVqT10cYaaw7BMUQ 4RHTlqNA1Y8F66QdlYFeL6zkg/QnOmWGC70TPrZGeVvvttYJvpuoS0Dym0ft/11L0NMfKY sVaiQImDSebJIzmRGNuzt/HPvhCUdTbQZ6ML6eFSi0Bji/HyDwjXR4MdZckzY/YOfDF8hL e87YuDCyP4t3zCJXarMW+ynh0GCNVdFo3dzq2JiDQCcSBwTbGixL/SbhJmKQdYDsed1vwN tAo91BLapWpL2IOM1edyfsW+ZaXN7CMVWRPHXIDU1WstFnMHXHdv2fIMZaFANQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657343008; a=rsa-sha256; cv=none; b=deUgoYlZZGwlvrq8oQwEjDO5xMPev29wFAXU5Iz9eaKcUA73D4XiQSGVwDDoN69zgsqqCW f6EOgcrBnCnKwF6v8URcvBaxp7oNuHDT7dtTZREOjwmc/0el/PaGBZ48OgH46HiI1mtPJt SEDPPnfnU3FBAW+1CdxfhrxlQkt7XYzs0oPiU9f39kjWXn8J40falXGkfIiGVRxvT/URA2 PS0nPnMxWe0lnkzoUN/YX7ztpx5lkYD39bYKtJ6rg+8Hor6hhIXqA7GBLjwD6l3xEJb3oF 9FevyBpjie2iX/8e4IWyVaoxUfl19k5kQAp15oHQj1z7Whzb38g8SEC6To/ekw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=87d3aa53973fdfe1fa2ea64a8da9e29f4142d5af commit 87d3aa53973fdfe1fa2ea64a8da9e29f4142d5af Author: Warner Losh AuthorDate: 2022-07-08 23:34:23 +0000 Commit: Warner Losh CommitDate: 2022-07-09 04:49:55 +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 --- 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 f847af8949ff..411e0e4638d7 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -24,7 +24,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