From nobody Fri Jul 22 16:09:00 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 4LqDrs2DFKz4XX6m; Fri, 22 Jul 2022 16:09:01 +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 4LqDrs1lwPz3TJQ; Fri, 22 Jul 2022 16:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658506141; 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=dNSshjbQ3mz/FZuNvNpI2dPLN8DUKgjOo8v+xYqGhYk=; b=aWjxT09LLYKrPhrR5ksx9zieiVmhbL9gahRNWpmMaxjqPjd8y9FI85D4Db1cZFyMWyChHP mQhu8fphQxt2jlJTWbugct3/EoVUhAL9LT5LaIGFaNDmh4jEWQvB0LDg6JEKWX0TQs4AKD PrwukLlF9n5QdcyWZ97bYRBtvoe4yEqU/EycT6CFizUwHlD4oAuO44EfcP5oVygIQlnfzl Lwm957F4ck31lcgBRwZQNvvptDPR2lbiE7fOJv2YycxBCPizs4iFae5tb+VO0urSXRqsJo 6AzSDm4Kipk7sMeoGpk9xkWOSwyNiYsQ5w7tQxLc1ToeOS6hNd9NMUBLH25DzA== 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 4LqDrs0dVDz16GD; Fri, 22 Jul 2022 16:09:01 +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 26MG90fo049016; Fri, 22 Jul 2022 16:09:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MG90wf049015; Fri, 22 Jul 2022 16:09:00 GMT (envelope-from git) Date: Fri, 22 Jul 2022 16:09:00 GMT Message-Id: <202207221609.26MG90wf049015@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: bb7ddd077c25 - main - stand geli: Restore include path to LDRSRC. 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: bb7ddd077c2528b37399304d7a9bf70b25c42b47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658506141; 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=dNSshjbQ3mz/FZuNvNpI2dPLN8DUKgjOo8v+xYqGhYk=; b=QIxz9CzYlKxhU/0IJWZLNIwZw1ejJGcWD2+ZwI86WZJcSo8E9fnp2NXC7P48ziulsj9roL +pbX7hE6Z6kNhCEcpWdl3EJxAPdPFfDgjLZBR4HllubTHPeqW64X0JP9zOBqLWz5xrSO22 syo0d21ZeDjreRQA1oNfsTQ4rrDYmWxAKNxWv/0XjC9f9KlWhEbDpTmScUSKj9hm/eSXVM H9cAsFhwNAb0ESd/YpOfph/TSFPkKPWWP8ZCnJKyDRphVdpHJIjH/4AMfiupDQ8NEOgVfd PF4O7ltDyrhiPE5CQVvVYQ6qSF679R7Purqq43duYFF3ftO1MdnBmauuyJ/x9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658506141; a=rsa-sha256; cv=none; b=Zb5q0NnaVWIqNr6OS06lmq7r5mjrqYusKf7VDBysWb+G+Al5hXVATcmgWD+atMT77c5++P GqsQQAd2VYv8yIIJhZbGT6Y23iflDCXLdjW04S0EQU1hYzfK9mYQcTSufpjWZc6sbI/+1c 1xdpOeIIWSZi58yXAbO/5i5SvM/PIzGeyswTAooZmIWzHzU6fTJOyACFn+vGj5U9aV9X/I lD4vu1o9gaFfGdwRQ4orFuPc1gcyCzSSF60HstRYQ4rRFb5Gje2J3iMa5CXZi3ZiuGOr6d JYkRNrL+am5lDAsoVuNOWoVyBVSbbysSVF71alDoBWgmgJ1+Y6GrHMbU6uBGGg== 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=bb7ddd077c2528b37399304d7a9bf70b25c42b47 commit bb7ddd077c2528b37399304d7a9bf70b25c42b47 Author: John Baldwin AuthorDate: 2022-07-22 15:56:18 +0000 Commit: Warner Losh CommitDate: 2022-07-22 16:08:46 +0000 stand geli: Restore include path to LDRSRC. Various GELI sources need bootstrap.h and disk.h. In theory they shouldn't need anything outside of libsa, but disk.h and bootstrap.h are currently required. This fixes the build with MK_LOADER_ZFS=no. Obtained from: CheriBSD Fixes: eaf7aabddcde stand: geli CFLAGS tightening Sponsored by: DARPA Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35861 --- stand/libsa/geli/Makefile.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 841eea397807..88a3bad82a0e 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -26,11 +26,11 @@ SRCS+= ${i} # local GELI Implementation .PATH: ${SYSDIR}/geom/eli +.for i in geliboot.c geliboot_crypto.c gelidev.c geli_metadata.c +CFLAGS.${i}+= -I${LDRSRC} +SRCS+= ${i} +.endfor SRCS+= \ - geliboot.c \ - geliboot_crypto.c \ - gelidev.c \ - geli_metadata.c \ g_eli_hmac.c \ g_eli_key.c \ g_eli_key_cache.c \