From nobody Fri Feb 11 17:01:42 2022 X-Original-To: dev-commits-src-main@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 912EE19B894B; Fri, 11 Feb 2022 17:01:42 +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 4JwKdy3WFHz4c48; Fri, 11 Feb 2022 17:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644598902; 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=cVyQ8vWiRGX2KldY0kKQWp3JnndaTIz2QboIgsM4L6M=; b=e8GlL0KKuFwvLG2CR3RKYH45G90xe0F+K5nlG2i6bIoGBtpVZpMhCfcYTJesfOz1CaIXkt ++guvps1gsG37AoMoaNOgi4hPv1EmPR0A/acteaKUN+j6aZNoh3FGHLq7jr0MCC8IpWmem ddMuph2GEIv4rDNuo8vjcX5wVxpkh8k+cOJ5pHHGRUR2PU65ZmR5VF91sC1Ob+e7o/iUV8 94SU1in4Zq/fZRMIhWfd66iIIj1CTIOGCuSApyyHN+AZB4In/rUuR9KGBrauTTmTYgir1S 6z6XOVm7POe/Fa/3JljdNvNBvfdOlCSFvSaorF4fMSXAkDSTbJSxqzDUsVI3cw== 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 527DE179EE; Fri, 11 Feb 2022 17:01:42 +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 21BH1g6H045270; Fri, 11 Feb 2022 17:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BH1gPS045269; Fri, 11 Feb 2022 17:01:42 GMT (envelope-from git) Date: Fri, 11 Feb 2022 17:01:42 GMT Message-Id: <202202111701.21BH1gPS045269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ea9a92d21007 - main - Makefile.inc1: synthesize PKG_ABI from newvers.sh variables List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea9a92d21007de1d445dc0539331ad6632eb4ad3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644598902; 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=cVyQ8vWiRGX2KldY0kKQWp3JnndaTIz2QboIgsM4L6M=; b=aKHG7BAxB9/ej0B1BCmOE5KNYlpPcm+UcYEz7JerQCg6uyaNglo2eGQ3zomaCPdqmT9vOw Tx4pQWYht6MpN2J4J2Hrrgco4EbXFgEmzUmicyWc3Fak3YJSFxk7XAl99VxZn1nQy62ATM PfuVHgbs8uYD7djjBcAL+6b2ROjeGvaMeTNUVQGnHX84r3DSJYHqC980I58ErwrMKqhdNP Jp+sAKbKjODPiTBd3hvVY3FA3urHjFJ2HMbPJ50t+L9CQcx169DJeypBp6TqLX0UluyjrT Ok/L8kMjFCq827IxiTRoM/TIBDoJB9nXAS1xtM0iRVI9hdEcnUVXfHxgFQtnfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644598902; a=rsa-sha256; cv=none; b=wF2dtsqIcMmrU5+utyZhWWBK4vJoZmVGhWkhiH8kBMJjzpPO0YQfFnxIvJoRJHQTWOSv4y +awAxKb3+ES8Gx87BZXEA9lE5cnTNFYTvC+0mTL5YrtpqsVaNJoKiD2Uy9kzLgcVAbt3nL ibrMWGik6Qny5WECIkfOrAyyMJhRNuPg0glkDujVyO1Fkmi1CG2vQnu2Bn+wDhbRC+hgjB AerJvdRPQhF+jQc6tLt3zoWyKDtBFyhHtvOb7QDPtZYyRFibJ2JGcbGrcB7l/guGvI0rYN BatQWcsQfVs7uhImyuwbp/oflLP0u+rBsat0YdGbKNwg7Pv7Fm+GUUYv+z7JWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea9a92d21007de1d445dc0539331ad6632eb4ad3 commit ea9a92d21007de1d445dc0539331ad6632eb4ad3 Author: Ed Maste AuthorDate: 2022-02-10 20:42:05 +0000 Commit: Ed Maste CommitDate: 2022-02-11 16:26:07 +0000 Makefile.inc1: synthesize PKG_ABI from newvers.sh variables Previously we inspected ${WSTAGEDIR}/usr/bin/uname to determine PKG_ABI, but the file will not exist in some cases - for example, if building only kernel packages. We can instead synthesize the PKG_ABI from information already provided by newvers.sh. Reviewed by: kevans, manu (both earlier rev) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34249 --- Makefile.inc1 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d27a81d7904d..cbbb2bc83ffc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -522,7 +522,7 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.for _V in BRANCH REVISION +.for _V in BRANCH REVISION TYPE .if !defined(_${_V}) _${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V} .export _${_V} @@ -1882,12 +1882,10 @@ _pkgbootstrap: .PHONY .endif # -# Allow overriding PKG_ABI, this allow to create kernel packages without having -# to build world first. -# If it's not provided resolv it from the uname binary in the world stage. +# Determine PKG_ABI from newvers.sh if not already set. # .if !defined(PKG_ABI) && (make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages)) -PKG_ABI!=${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname config ABI +PKG_ABI=${_TYPE}:${_REVISION:S/\..*$//}:${TARGET_ARCH} .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ awk -F. '/^[0-9.]+$$/ {print $$1 * 10000 + $$2 * 100 + $$3}'