From nobody Wed Dec 08 07:40:41 2021 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 A449D18D12F9; Wed, 8 Dec 2021 07:40:41 +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 4J88Gd27lwz4SRg; Wed, 8 Dec 2021 07:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2A08B7682; Wed, 8 Dec 2021 07:40:41 +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 1B87efWi026344; Wed, 8 Dec 2021 07:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B87efNe026343; Wed, 8 Dec 2021 07:40:41 GMT (envelope-from git) Date: Wed, 8 Dec 2021 07:40:41 GMT Message-Id: <202112080740.1B87efNe026343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 59f4abfaac8b - main - pkgbase: Allow to specify PKG_ABI on the command line 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59f4abfaac8b14a857625c5495284fced0c51fd6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638949241; 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=x4N1y58OsdwQX3PnLdvwFX0FNhF2ZPvIxkz46IPfjWw=; b=xqNMmPF9OHWEcNluZAn0tHvzqVHiKEwWg6wH8n+Hxk1Pcrt1GbdDiWxHVCxtk2A8590Hg/ FgOokJOURFUrg9ic0ooLAk3lW38wH7jChaA2++zuuPmkMbXmr5ldJuuDyvL+CZTrEiCbqo gXiyZziQ5UbzvHbtz/ex1Cq2DHDurternR2iPqRlna9VmyUMBbYXiB0wGCvnwDr0wCPDgz dUPNOSG9v2KMH9Sdq6P1yhpTj/6GbnUHLBFtpsXntJPEgxh4ESW57zVJfo1qMBzC4gQolM jpcyeLF+abxD5Z/Y2sEN1t3knHIvAZXsRKFfg3FRYmyQOy/Qf1VYtCC4ot/7DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638949241; a=rsa-sha256; cv=none; b=pEYnzm19ofS9pH6W1KtrRBtGi7GjIBp8yWDW91cwurKykkfOJRL7YJu6LPStEtjjpC3/W0 uA3+ueGVwLHbb6jyHHy0jSOYhdGX9NRglvRbOImxww8rUNh2GQT/yK2AUwX7QYQd+g2L73 qjKT2Z1Wy8ekL9BiW9vijnXCOVzbmbfOXgGLdqY4n3G/NrGyDUpGdK7O6RnRybmX1G0WNk 0sRSjXqCZA3NQrzh/eNyDx605usxFQQSIHaCMrXlbZl0BksNjrpAgR7n5hXqoISHaGBhwI DYCxv9FvbIQ0mmpbWWkM6elejiHdShy0nRmKEsVwck1AO2RsTMYDpBhc+pGQLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=59f4abfaac8b14a857625c5495284fced0c51fd6 commit 59f4abfaac8b14a857625c5495284fced0c51fd6 Author: Emmanuel Vadot AuthorDate: 2021-12-07 17:02:58 +0000 Commit: Emmanuel Vadot CommitDate: 2021-12-08 07:40:22 +0000 pkgbase: Allow to specify PKG_ABI on the command line This is useful for creating kernel package without having to buildworld before as we use uname from the world stage dir to get the ABI. Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D33323 Sponsored by: Beckhoff Automation GmbH & Co. KG --- Makefile.inc1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2f7d98341793..ee4f9b0dad4b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1896,7 +1896,12 @@ _pkgbootstrap: .PHONY @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif -.if make(create-world-packages-jobs) || make(create-kernel-packages*) || make(real-update-packages) || make(sign-packages) +# +# 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. +# +.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 .endif PKG_BIN_VERSION!=${PKG_CMD} --version /dev/null |\ @@ -2061,7 +2066,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap /name/ { printf("===> Creating %s-", $$2); next } \ /version/ {print $$2; next } ' \ ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \ - ${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname -o ALLOW_BASE_SHLIBS=yes \ + ${PKG_CMD} -o ABI=${PKG_ABI} -o ALLOW_BASE_SHLIBS=yes \ create -f ${PKG_FORMAT} \ -M ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl \ -p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \