From nobody Mon Jul 17 19:04:21 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 4R4Wj12NNFz4n0Kj; Mon, 17 Jul 2023 19:04:21 +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 4R4Wj11sqdz3q38; Mon, 17 Jul 2023 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689620661; 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=g4DUtZoL0EX3VHHEMYKwhxJu2j7g7cUXhypWl+cKMWM=; b=I4PYLcLkrymb/DW2jfshxor1zbLf4c8Gr9WD2vyGfjRy3N9HqQFN6p+HQVq3zFxPjGC8UP 4Pyh0Ec6T68s6dFN+viAHuc24+3bjg/xDEZPnVtVuPn87HUI4hdTJQLFVDMm4skE2uzx+H cYrlZIotOn0TlOalrOr7wRrYA+4U5FvELZda7BZJblli1FBCaA9MJkCB9lpWWelhZ5vx8j J7OQwJXiZSjzN/crHUh6VvV0P9cd3OszVtKTZtFxhDMoviJx+SbEOsatLb0o8KHlP6Bjmk wtbMKB5bRm8qc0L8oytXyjALfvdfs+qsHR+L45BoLfIifvQoqZnIdTOCYVHkfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689620661; 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=g4DUtZoL0EX3VHHEMYKwhxJu2j7g7cUXhypWl+cKMWM=; b=BUHBc2WxuxBcYQtOD9VaRz6vlZfzyYlgvOa24e39PtNBjQ5KwRcHLLPnaTpBBg8nUVahB2 kfZdDlf0CqYIUNDuwhILSMgn61hFlLypbEeL2sVC0BaF7tCGsTm4joFeYduNNjXSNhsTUr g1sWIYSfWWunqOYIFbq4W98A1uW72guWiTmaOPuM1VJ/dVQjMETZM9wZ3hiZ/8t542tZ+L eiN2RCjlDghnCaPc0eUbIRa2rSgTCUnr8TIvoM/kcSP5kEke/wI0G6luc2FTdtNck0UrHj xhjkMkLsEWwtQoaVVxtHrVbRWFRCgi3uQHhEyiXEZXfr7vUQzqqyF7C3+JdLYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689620661; a=rsa-sha256; cv=none; b=sYwo0SEeEkBwZSyBpFwNVkgK6GzlwgnCgJoaG9uQ0tcgNodZwgdi55eBRii45pMUpk4TC0 pn/DBq46bAYvE/dEVp5XrTA/COjaQlJLWvrawVtpOtLkjZxo+opVaow4O6pns38M5GrMiK mXVcPbMP5OTglwDbTvB7RZvYXdsQcsHQvIsysG8lrSm+LYP3u1RYcLIaZKTfYVUcRd5Uaa MG45HhUG0T7P1wp5SYLQd55b4AolPuhVsxTeVQkoT7BVX7aLi2F7BhsY0dS8WW3eKBhbBu O4Ppl9Rp/3i7mBd7QA/+PNlnx2zn7w5aXAt7fWFBVPNhEwaZQSSvqPlKfqNX7g== 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 4R4Wj10rmFzbZT; Mon, 17 Jul 2023 19:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HJ4LtA013462; Mon, 17 Jul 2023 19:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HJ4L1l013461; Mon, 17 Jul 2023 19:04:21 GMT (envelope-from git) Date: Mon, 17 Jul 2023 19:04:21 GMT Message-Id: <202307171904.36HJ4L1l013461@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: 89f361f742ae - main - kern.post.mk allow NEWVERS_{ENV,ARGS} 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: 89f361f742aeae11c8b2e28eae3d015882b6c0ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=89f361f742aeae11c8b2e28eae3d015882b6c0ee commit 89f361f742aeae11c8b2e28eae3d015882b6c0ee Author: Simon J. Gerraty AuthorDate: 2023-07-17 19:03:35 +0000 Commit: Simon J. Gerraty CommitDate: 2023-07-17 19:03:35 +0000 kern.post.mk allow NEWVERS_{ENV,ARGS} Allow makefiles better control of newvers.sh env and args. Also allow variable overrides on command line. Reviewed by: imp, stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41012 --- sys/conf/kern.post.mk | 5 +++-- sys/conf/newvers.sh | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index c368d5f40df8..45df83e2d16b 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -444,11 +444,12 @@ config.o env.o hints.o vers.o vnode_if.o: ${NORMAL_C} ${NORMAL_CTFCONVERT} +NEWVERS_ENV+= MAKE="${MAKE}" .if ${MK_REPRODUCIBLE_BUILD} != "no" -REPRO_FLAG="-R" +NEWVERS_ARGS+= -R .endif vers.c: .NOMETA_CMP $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP:Nvers.*} - MAKE="${MAKE}" sh $S/conf/newvers.sh ${REPRO_FLAG} ${KERN_IDENT} + ${NEWVERS_ENV} sh $S/conf/newvers.sh ${NEWVERS_ARGS} ${KERN_IDENT} vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src ${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 85346b1cdc29..e21b3f5ce2e2 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -58,13 +58,23 @@ BRANCH="CURRENT" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi -RELEASE="${REVISION}-${BRANCH}" -VERSION="${TYPE} ${RELEASE}" if [ -z "${SYSDIR}" ]; then - SYSDIR=$(dirname $0)/.. + SYSDIR=$(dirname $0)/.. fi +# allow random overrides +while : +do + case "$1" in + *=*) eval "$1"; shift;; + *) break;; + esac +done + +RELEASE="${RELEASE:-${REVISION}-${BRANCH}}" +VERSION="${VERSION:-${TYPE} ${RELEASE}}" + RELDATE=$(awk '/^#define[[:space:]]*__FreeBSD_version/ {print $3}' ${PARAMFILE:-${SYSDIR}/sys/param.h}) if [ -r "${SYSDIR}/../COPYRIGHT" ]; then