From nobody Tue May 23 16:03:12 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 4QQfHP2NSXz4CdnL; Tue, 23 May 2023 16:03:13 +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 4QQfHP1dXbz4Mqb; Tue, 23 May 2023 16:03:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684857793; 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=CMttGuA2UNLiQO9HDdguF/RcN1SyeDD4zXcN08P+hLw=; b=YSnd6d2r7IA9z32e2fVPm/QraJeA2eeHHa3rm9Wcrc8jeQnFyTvzHEvVhLR83FkYCVCr8W aqnsqTB8y+GJFVX76Ys28X1ybrrCiJHjWhpdpAFfZci3TAWNZityY2XtnJK8vf1dzEOxjJ DAXxz6pytMXnTXnaiU7W3mO09P5VtARufqmINSR+8VQKGSl/7sQZFPlBjMVtweh8ZwSuwg ndLuaL3948kdarzCDAxeVjMy+4hr0M+PMRUDMvtOQ9vdNZhQzoiUhnMqkX/+4GeiQNMoxh 0NnsMQR+uwJ0pkFFRZE1a9tjBim5v3gP63OSX7g31FyYj6XQR/nNHC/3mKyjsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684857793; 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=CMttGuA2UNLiQO9HDdguF/RcN1SyeDD4zXcN08P+hLw=; b=Gyk3uqaCZtYszQFAbEWZQ+nYQX06x4sRH1M9qIlORtB1sUgU9vwcBBzxjsI5mWKRc5d8LX o1b/nG5BdROG3XbrVWtlsxgKyeVgYZloJLgqhf9gx6ZEL5pR1gat24B/H+hQRwimWefV4m 5DuPmfb0l3tDcQtjZFRRRaa9vSPKiIg+AhMgUrWqPqfTF+/E1KEqaVPv+qAiz3xQgCpPNP T0Wg7XEQPtltxajTuZ/OtINk3DiqNStEhp/9FQikM123XKb6S8j0mHwsJJgvd9HwBt+sTw KeC6HcOJ9Y3FXEBQ2arBsvQz6ox+JKOuQB+Wk26P/LM2OhP4i8hdjuXb5YjGjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684857793; a=rsa-sha256; cv=none; b=MKY/309VmXTBLFtzet3hjqkKvreh5JRNXGIEd9M/fvedFGgQ/joeJCXPQ9KLfDedbVF/8E txM1LiNQ5KOBkmgjthWl6JLoqvhBepiFmd4TRngkr0N4mK/vGcop18h6NeyKuWfrgNGuzw irPnjofPeWnpnw2XFZurvMChNlA5HI+7CmU4vRjLR7aS6RDMDrLPfdOX+Z4ZDhsDnSI5AC cVNJ+UJ1YjNpzKC08ouYIP61GakvPRwG3KaVG9UomVI176v0sb3aHrXtI82lsQTGhFTmbA wtHhNKwWt4cy+huYt7ohNLeAV7j491qomXzQk5hmCQKATaEc8OzQq/V5oXbQ/A== 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 4QQfHP0fTpz16B1; Tue, 23 May 2023 16:03:13 +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 34NG3Ciw081048; Tue, 23 May 2023 16:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NG3CPZ081047; Tue, 23 May 2023 16:03:12 GMT (envelope-from git) Date: Tue, 23 May 2023 16:03:12 GMT Message-Id: <202305231603.34NG3CPZ081047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 75e02c458a0d - main - libsecureboot ensure correct BUILD_UTC 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75e02c458a0def1ee8054646434c738b4004de8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=75e02c458a0def1ee8054646434c738b4004de8f commit 75e02c458a0def1ee8054646434c738b4004de8f Author: Simon J. Gerraty AuthorDate: 2023-05-23 16:02:00 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-23 16:02:00 +0000 libsecureboot ensure correct BUILD_UTC If using stat(1) on BUILD_UTC_FILE we should use -L incase it is a symlink. If we have new enough bmake though we can just use ${BUILD_UTC_FILE:mtime} --- lib/libsecureboot/Makefile.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libsecureboot/Makefile.inc b/lib/libsecureboot/Makefile.inc index 921b5e7bc1d8..325eb5fb0d27 100644 --- a/lib/libsecureboot/Makefile.inc +++ b/lib/libsecureboot/Makefile.inc @@ -126,7 +126,11 @@ BUILD_UTC?= ${SOURCE_DATE_EPOCH} BUILD_UTC_FILE:= ${.PARSEDIR:tA}/${.PARSEFILE} .endif # you can of course set BUILD_UTC to any value you like -BUILD_UTC?= ${${STAT:Ustat} -f %m ${BUILD_UTC_FILE}:L:sh} +.if ${MAKE_VERSION} > 20230509 +BUILD_UTC?= ${BUILD_UTC_FILE:mtime} +.else +BUILD_UTC?= ${${STAT:Ustat} -L -f %m ${BUILD_UTC_FILE}:L:sh} +.endif # Generate ta.h containing one or more PEM encoded trust anchors in ta_PEM. #