From nobody Sun Sep 14 02:05:29 2025 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 4cPWhp2C5gz67sCh; Sun, 14 Sep 2025 02:05:30 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPWhn6krgz3Cxn; Sun, 14 Sep 2025 02:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757815530; 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=xSf6WcVVEgok2kNR/cnrgAM6XqIZQR5wH3cc/MVBkx8=; b=yRr8IJ7SRb0AljkTGZaG+XQzqvkGFJPv0aE2gM1zHuRPd4l1U+qt78ubtfP+MqCc3fuMgz 4zbB4yXALiyKBhWyNfWC3sG5j8J/u/1fEMC6BSSH6cWd4ETvN5YYuPfpO5J2rhskfJuF8q 4Cwktl8ZQN/JNUf0WkvIql/JTRQRl2CpQJEf6RgF+6RdYgow/Dffa6pwdLAve+mImTjuG2 jgcykDu3SQvf+7t+fBbzG5jB9tQDI9tQbcghbqL2K+wqXTC/DCDXQVhCej72EeO37vlrGl WfKXp3J0RzavVIfF0LX2ylb5ZLTHcG8BIFS3JyymLXacAst1gt3TKngLo9LDuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757815530; 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=xSf6WcVVEgok2kNR/cnrgAM6XqIZQR5wH3cc/MVBkx8=; b=bKAA3WgGYBrik+Qi8Fv0xaayxmMlDSNqutZLMiyL6ivxryMk161bhU55L58lS0Jia2s5dB aZvWCuC63ExyJFyxzVKaAqUvTod3B4zREvVS9A5Sy6+5OnEydCKECLHKAhMHrAaamQb+T0 +qDWMMMkmyo+/CXFo+79KVA3VxSbZmlEieC5rbdAFd/F1GJR5Pd8dO9bUqz8cqS9TJdWU9 acy6LMsFDJSQ+gUhoP+4JUmfj7ov8I3yZxQssVFGeJXWcqbB7N2zfW/so0CRpxtItkHa7r 6S5RU96+wQbufg0/oqVA6zCf08Kzk6R6GyFJJNpz45LKUmCBG3C2eLXthbHqHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757815530; a=rsa-sha256; cv=none; b=fbkJ0qwfz9Ubn3RU+j+C3BIPz/ALzqp8O1q8c8PtGatuU1M+3nqAMzaWcaqQsUNQzos3zc gv/G44Slh9E0GlukdaT8hri6dyv2WTUULdKQ8GNIFCFz8eDiU2eluJtDspD6YSaD4Bqgz8 WYI+XgrTeLhd+d1x7n/zAgmD+XXk/QUrUQGJcRdOyOjD7jYQvSmBAMtYARcwfXEGByL/lh scXoFjStSdzkYkDYhIV0lBdag9mnpb/UzZwia8mtIlDlKfsFCeJepJk4G4X8pPX/OUuhv1 3pTyyCLJIjrx3qzn+anx8xN6XXCeUFwiKIS423c6bP3v2L4o5Zc8RLJ8he8bSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cPWhn63dJz14vb; Sun, 14 Sep 2025 02:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58E25T39017204; Sun, 14 Sep 2025 02:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58E25T89017201; Sun, 14 Sep 2025 02:05:29 GMT (envelope-from git) Date: Sun, 14 Sep 2025 02:05:29 GMT Message-Id: <202509140205.58E25T89017201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: da62a299de31 - stable/15 - release: Pass ABI to pkgbase-stage.lua 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da62a299de313964b9a9be2709e04eff857da5ca Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=da62a299de313964b9a9be2709e04eff857da5ca commit da62a299de313964b9a9be2709e04eff857da5ca Author: Colin Percival AuthorDate: 2025-09-14 02:01:26 +0000 Commit: Colin Percival CommitDate: 2025-09-14 02:05:21 +0000 release: Pass ABI to pkgbase-stage.lua We then pass ABI from pkgbase-stage.lua to pkg(8); without this, cross-building releases with PKGBASE enabled fails with pkg: wrong architecture: ... pkg: repository FreeBSD-base contains packages with wrong ABI: ... MFC after: 1 minute Discussed with: emaste, jrtc27 Sponsored by: https://www.patreon.com/c/cperciva (cherry picked from commit 340e68fd7c0d62cac1f0876b6475a89df5065db5) --- release/Makefile | 2 +- release/scripts/pkgbase-stage.lua | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 6fd3b2f61325..d0177c8aae5f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -213,7 +213,7 @@ disc1: ${PKGBASE_REPO} ${.CURDIR}/scripts/pkgbase-stage.lua disc \ ${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \ ${.TARGET}/usr/freebsd-packages/offline \ - "${_ALL_libcompats}" + "${_ALL_libcompats}" ${PKG_ABI} cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \ ${.TARGET}/usr/freebsd-packages/repos/ mtree -c -p ${.TARGET}/usr/freebsd-packages | \ diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index 1b48b4faede3..a12ec372d1a9 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -115,6 +115,8 @@ local function main() local target = assert(arg[3]) -- =hitespace separated list of all libcompat names (e.g. "32") local all_libcompats = assert(arg[4]) + -- ABI of repository + local ABI = assert(arg[5]) assert(os.execute("mkdir -p pkgbase-repo-conf")) local f = assert(io.open("pkgbase-repo-conf/FreeBSD-base.conf", "w")) @@ -127,6 +129,7 @@ local function main() assert(f:close()) local pkg = "pkg -o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes " .. + "-o ABI=" .. ABI .. " " .. "-o INSTALL_AS_USER=1 -o PKG_DBDIR=./pkgdb -R ./pkgbase-repo-conf " assert(os.execute(pkg .. "update"))