From nobody Thu Sep 25 01:01:42 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 4cXFm722pHz68k5k; Thu, 25 Sep 2025 01:01:43 +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 4cXFm65xFXz3bgQ; Thu, 25 Sep 2025 01: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=1758762102; 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=Q8y9flXTeYqZ+Ve1OUN5YmFFz7Ij01rw42BzyLJ0aVM=; b=LRHFjmaLYX+WlF9ExpjiJ6APW8bfJf5bTzEf7lN+tEnRWkCYa3K+OH5k3nEi5PH//zYfxG vdmYV4ND9r3Wfp6ujrrm1grA0P1xf9jLZ0/beqmx/nZLqbBegBPGg2mh/rLHOHkcT8govJ 5KhwHT8VYWEmXyIgcSzQ+bv3buhm4gOJOew/8NemXn7N70So0gU4FRcMjY9x0NqLpWV1Yh lyPuG0YK62u8mdBineDm9gvyM1PYdBYXhOOFA9b15EYVMv+s4fxt+gB1ahEZv3bkrIlxis z8WoA2n7tL9ODwh7rUocaVlXt9ooQCsOKHWRSX/NHvemH8VTjBqXeUqE6nV2hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762102; 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=Q8y9flXTeYqZ+Ve1OUN5YmFFz7Ij01rw42BzyLJ0aVM=; b=pDIQBSCo9Koib6ICOI/iVzts51Lv4HeE5woAmCYXkKMC4UYiXM6JHXF7SbjXcvB9tmb0ZW c/MCMvcoJmikc/eoee9IwQwsjLrGJNqyurISsuAyylKa3f+mrbK2i1v1Qf4XY32qgRio1U XDxAV47MNxJLrp6/Qy3OGrEg/Nxnm0FdXqWatF16x98hmWmNZYrz0Jnjw3UhbvAMg3dTZU On6Nzpk3v0Ti0pNRZmDPaJfhSYJLDHKtBKagM9eASedKSyaVSi3JefLzVDDBnHCXCaBt+i ncWkHvMZuSlitxhKN7Vt44PMQHHE06edLUYViQkuCsLU+RRi76ieDaLsggs7Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762102; a=rsa-sha256; cv=none; b=aHY6hBzj5x73pjMa2DI/RPKpob3jRQ+NB9VWJqOtnxhCTTz/8aRieSWiFaksLRnDC1i1Pz kbYgBQjpZxPO/7EhgjKhiHcIELFNvJ86xdU1PNAQ4unOujHEnLrnSadQP3tIJQT6DAZL5v nuA/fI/5QxAicvOVEOLr2/bpPmtWf9jrFkRkCFtYbeCmKf/5YKMdG113md3KjjPYdTcHRQ THhUeYK6SjXodPX8uhqF8//YSqMJSAHEu8swrr0m/XdwvcuCEyo0bKVEhipVG075X9eTfM KnxSgKfWj3B+IHB8dn1ERmJ+oQbEeRdldaDGWq2qUIXxDz/8/rnBFNIypnMV7g== 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 4cXFm65CxTzw4d; Thu, 25 Sep 2025 01:01:42 +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 58P11gIS086993; Thu, 25 Sep 2025 01:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11g7s086990; Thu, 25 Sep 2025 01:01:42 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:42 GMT Message-Id: <202509250101.58P11g7s086990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 3608d730ad33 - stable/15 - pkgbase-stage.lua: Add pkg package to the offline repo 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3608d730ad332817e735239ecd7e61b162148a33 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=3608d730ad332817e735239ecd7e61b162148a33 commit 3608d730ad332817e735239ecd7e61b162148a33 Author: Lexi Winter AuthorDate: 2025-09-23 22:34:03 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:41 +0000 pkgbase-stage.lua: Add pkg package to the offline repo We need a pkg package on the media so we can install it for offline installations; copy this package from the staging repository to the pkgbase offline repository on the media. MFC after: 1 day Reviewed by: ifreund_freebsdfoundation.org, cperciva Differential Revision: https://reviews.freebsd.org/D52636 (cherry picked from commit 5bb96dab061af5f44e6090831f1b2724196828b8) --- release/scripts/pkgbase-stage.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index 9e968fd150f8..94dec96673de 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -33,13 +33,17 @@ local function select_packages(pkg, media, all_libcompats) components["kernel-dbg"] = package elseif package:match("^FreeBSD%-kernel%-generic.*") then components["kernel"] = package + elseif package == "pkg" then + components["pkg"] = package end end assert(components["kernel"]) assert(components["base"]) + assert(components["pkg"]) local selected = {} if media == "disc" then + table.insert(selected, components["pkg"]) table.insert(selected, components["base"]) table.insert(selected, components["kernel"]) table.insert(selected, components["kernel-dbg"]) @@ -50,6 +54,7 @@ local function select_packages(pkg, media, all_libcompats) end else assert(media == "dvd") + table.insert(selected, components["pkg"]) table.insert(selected, components["base"]) table.insert(selected, components["base-dbg"]) table.insert(selected, components["kernel"])