From nobody Sun Sep 14 02:05:05 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 4cPWhK4jj5z67rmw; Sun, 14 Sep 2025 02:05:05 +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 4cPWhK2HDXz3CL8; Sun, 14 Sep 2025 02:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757815505; 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=fymjfjFkWbh98+A0bkOuB458lG+49nEy6vQXQpbs70w=; b=n4fgjbza3XPpNvMf9ATy11hlWmin/eg33ToQcwliFc3mjvJebt4hhBu2cEwqFrcPOcIOru toiFc8bSAYV1TtTq4kNDKnSx+d7Ge+x1tLori3gtwsfbh04FNAsLRSyJXipw00z/KXM9Xz VIcx5b7yx7e+F2Sd0EMZcWgBtANPHIA87IoJvXaWDN4G1AxkBiedXrb4SBHV5A1vT01rLv YoAfkvi7nWzmk9gCAwB8egmhFQ/DjtPtgeuRHUaQc82vQBbOnXAtd06KLMD9l4D7GiziC/ Z4dBLFRoHKqBr1Mpi/37NMvk0AME4sNw37IhNfGEgobik/afFZqruwLiC5+BGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757815505; 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=fymjfjFkWbh98+A0bkOuB458lG+49nEy6vQXQpbs70w=; b=KxRtEqU/O7ZF89XbhkTnipTcSgdkgpJNUvpEhuyk8moKUg61LvJ7Aq5z2OnVnQ03RKuJkR leJCZHiKdMdVz3EBUHQdEWXROZDuxJ2kCOSvSR7oLo2X3uwNA96Y+/FylfX+RgEwmZOUYR WpBY5v+FcOuslyLFwX3dyZ2ABfaq9dRHywIbGzZZV/4InBhvdf4ZjNl4cLZA9WWio0uF6o GiZwBJl4k9/F4i5LHpGaqZYxTkCRCUrWsd6sYsggJhsevZwhwAgb9P3Mx4xODQnxvBc9MA DNGpMDTGRY+3tHQsq76xIHOOUzUjJi4QAzQdU6xRiKZMkqM9/4cqcdK9UCBroQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757815505; a=rsa-sha256; cv=none; b=QzyVHpXfUKS2GNrIkDqurUXf8PaJCWmG/pqg7Z/+SDejSl2M9mvq2WyfhkrqNRp77MWxLv xhjomV5CgPkUM5gqjg53ld9SIjpu3uye6XOhJBnAGlGnh1kcFHRMJkX1uAq3Frz3cOL6cp MuiRbeB9JbNEnyQoja3bXGKZjRbeHY4BI5MJc191gO/Zl8cs6m4ShoztqeFVLrFk2EYRjE llfeGfQY2jctCWNYvr3pMItYNhQWToKRLcqgL5mxRMwp2w+v29xhvRKxzcO6sJti4tNZJ1 3B8Vsl4wRFXUNL+PsYB+gk56mOEv5LLnOox42A7VgYH1UzFdkQE28mZq6thOVA== 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 4cPWhK1rpTz14cD; Sun, 14 Sep 2025 02:05:05 +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 58E255ms016943; Sun, 14 Sep 2025 02:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58E255br016940; Sun, 14 Sep 2025 02:05:05 GMT (envelope-from git) Date: Sun, 14 Sep 2025 02:05:05 GMT Message-Id: <202509140205.58E255br016940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 340e68fd7c0d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 340e68fd7c0d62cac1f0876b6475a89df5065db5 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=340e68fd7c0d62cac1f0876b6475a89df5065db5 commit 340e68fd7c0d62cac1f0876b6475a89df5065db5 Author: Colin Percival AuthorDate: 2025-09-14 02:01:26 +0000 Commit: Colin Percival CommitDate: 2025-09-14 02:01:26 +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 --- 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 b6a9aa42c2e2..6be29a425f0f 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"))