From nobody Tue Jan 24 22:11:47 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 4P1h5b3KSQz3bfY5; Tue, 24 Jan 2023 22:11:47 +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 4P1h5b2TNmz4PPx; Tue, 24 Jan 2023 22:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598307; 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=TPwybZvqee1HB5L09ixGRJ4DUTSoZkg3Q9sELwWHpaY=; b=gRCX7M5DkuQzuVU0Fo6bG39lB7vaRHdJbzTXpeurJrp/PGynV1diyNlGdNGSkoZEZNIwYe 0TwLpRB3PXEeCU6j+W2OuQ7it/Beouwa/pIk4OazahoCwcNZ4grLNx+VdZEbOFb+Y7/TKZ Mgd1uTzm6FTu1AL8JYo/BQLnsL1HyQhofwchO5HLhhLysduBrOxaFf/3qvC5wb/lcmEUNC m4FrLEPv6RenZddh/CyycSWexO9TZR4LXOYNX51h7Y71cm7gHmOjOpRahTrUupNxT3/DXz zoJL1wWjxTD//Ji31NTeIo5ePCzYLF8WrLsoHZ8ztCaH8E6NTi+E9s+M+qiccw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598307; 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=TPwybZvqee1HB5L09ixGRJ4DUTSoZkg3Q9sELwWHpaY=; b=nkcJ0d/oQb9q79lMkkulNpRRHQkXrFLV+J76mHGre7edTyI9ePCTsxy1uF6klM9tDKkVLP ZRDPlfkks9jJzWr6qrO0uhskUEBNUvE49KG6NpHMENVmAyclCB39r5ArTzzC927cOCC/vy tFXyn8AAnunEganuc8v+9nMNwGc1NbsS44hboLr6ePJYI8hh26arme7dm8fV6hI0Yh6GNe wIuoskmgc0UoQ/qd+QqtCYoe477iZCPiC8y5PhEqpfUssMpYusu/imYjPksUgGjofPd0lN WYPzHJ+wNr+kph9RRldU7OvkqmM1OljgFyqgAmo+2sk8osEr/BaMI6VMXweLyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598307; a=rsa-sha256; cv=none; b=JIgRyEQUlOKSO8OWJVoTrOty5QJwOZA2ZIXreidKKLbJ5EiSegTRjnGqF/tA1nx0xidkOn VH/FWR3gX+idRdzyXEp3uogPv1F+ecPCHaN3AK5ZF5coPhTBbmKiXCLXwp4MBGpxBI5dBO gtv+cRn7daf0lkv0d4Z3PSp2l+FxpfG8vuKuRdwik0tL55DGpvGET8K5Bwv6SIZoKjP9Yl rY11VQR3qzAGp54VLrrfiaxKoabDn7tJycpXxtB6qJEDRIroQVDI5Qov6FxqLSjX1HSRTM 2IXvgGkoDMkfBI2wzNyWOhdWbsNcPCW0orgeAXKeubXFRvQ4Kv7n1TdLi3Zzeg== 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 4P1h5b1XygzQXR; Tue, 24 Jan 2023 22:11:47 +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 30OMBlJa085198; Tue, 24 Jan 2023 22:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBlUu085197; Tue, 24 Jan 2023 22:11:47 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:47 GMT Message-Id: <202301242211.30OMBlUu085197@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: 5a0e9f3a220a - stable/13 - stand: Reduce number of files that need -I${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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a0e9f3a220a65a1d600778811ffb991d497609e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a0e9f3a220a65a1d600778811ffb991d497609e commit 5a0e9f3a220a65a1d600778811ffb991d497609e Author: Warner Losh AuthorDate: 2022-08-03 17:16:17 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:29 +0000 stand: Reduce number of files that need -I${LDRSRC} geliboot.c and geliboot_crypto.c don't need anything from stand/common, so remove them from the list of things to add it. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35921 (cherry picked from commit f863970a82f430a2b10b9799585008fe89eab00a) --- stand/libsa/geli/Makefile.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stand/libsa/geli/Makefile.inc b/stand/libsa/geli/Makefile.inc index 88a3bad82a0e..c60cb37c59df 100644 --- a/stand/libsa/geli/Makefile.inc +++ b/stand/libsa/geli/Makefile.inc @@ -24,13 +24,15 @@ CFLAGS.${i}+= -DNDEBUG SRCS+= ${i} .endfor + # local GELI Implementation .PATH: ${SYSDIR}/geom/eli -.for i in geliboot.c geliboot_crypto.c gelidev.c geli_metadata.c -CFLAGS.${i}+= -I${LDRSRC} +.for i in gelidev.c geli_metadata.c +CFLAGS.${i}+= -I${LDRSRC} SRCS+= ${i} .endfor -SRCS+= \ +SRCS+= geliboot.c \ + geliboot_crypto.c \ g_eli_hmac.c \ g_eli_key.c \ g_eli_key_cache.c \