From nobody Wed Sep 24 09:16:52 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 4cWrnx1zc0z68mh0; Wed, 24 Sep 2025 09:16:53 +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 4cWrnx0hj1z3wb7; Wed, 24 Sep 2025 09:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705413; 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=1NHEsMdVebJerSM6geVp7PAc2zFFO9ri5qS4aM64KIQ=; b=MOjwfcZ2M/dfj/Hcbz4y3bbT25U9SKwFJaJmT9Qih1f+fUWs8ExxtLi3qdbrO/thzCFum6 Z/GPfYt9l4zMLPIMU7ADvPIXGcamLXH+nHXnn6FfF7iew7GhcOzpWx6p2c4M7IQRQJn48G 0J9hX85MFV0kfYzT2tV8s9NDAQUU+J4ExU9SZUYsYOxCyNSOceW+ZVnQ7QQwYV/Dyjj4Bb RKRtymoki3dUOiFIZXd5MBa/CPEHM8sEMCWlIGhfDzVoLqgdebmzDvgWEZ/iZRW5Rc40no jpDqdl14Fl5TjD0g3uW9vS4aBnsQR1r3zS+zHgX+Ofi0ZWojbastddT5FJG6/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705413; 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=1NHEsMdVebJerSM6geVp7PAc2zFFO9ri5qS4aM64KIQ=; b=xi5boLzAZe+SSgYVSMXKhG/FCG1kNHPuhFlkro+h9wlUmR9B0wCdQK6/54kO8FoEZfU0Im LaCNYEaRXqV+/DdMTaaCvRMH89k3oWltBGnKL6LXjixaaUPjmg3pCVNcs1qDA47wZDJMff EmnMEPngLZC6/45vhk4MRcIrLl3MhMUAUVgOpAtTKyXV05XoMA9kG5LtTPqDtB6ijGkQwt uDbbBhguyg3dcr4F0SGIA8R8xG1lGZBt9JNR28JA7A4ZQoAWPXrH+hEt7XjgC5JswJYoKb q8qOMC+k8bVFWvbFSNrQwn/W+h4XaPBiBUS5pvCL5Wt3yK2S2MVZ3u5VCLBmBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758705413; a=rsa-sha256; cv=none; b=Zk6OC7paUvRwWVkP8xPavfz7+m/OmQQ1iZfnITOz9NlhlH45C7bWDXDuUSUQLG7bYctxzH k90tKH27ywNMEnGn4vRbHBACQcjOgnrqNPnZbMhEtVSh8SomFZxtm2NtBm9LNKRfKtUmPT /qVCLvKLAd48yf6ieu+km7iot0Ti8us0j/a8NB0sq2D8HFmOjMaAkBpIzff4WTUkfV1v3b 9k60ydY32eJw8NbRwdTd4HI1Vdg4vnIx32JfwDGIeNstzJuO6lDYPNOB3rKOyQMhWwf7HM LzmGGyGhpV1w15QyCPiFF84K90AEMhhjXB5l3sLNo5rW4Vt54bAcAm7I0K4Znw== 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 4cWrnx0J5Zz9ZS; Wed, 24 Sep 2025 09:16:53 +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 58O9GqXF001664; Wed, 24 Sep 2025 09:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O9Gqjn001660; Wed, 24 Sep 2025 09:16:52 GMT (envelope-from git) Date: Wed, 24 Sep 2025 09:16:52 GMT Message-Id: <202509240916.58O9Gqjn001660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 5bb96dab061a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 5bb96dab061af5f44e6090831f1b2724196828b8 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5bb96dab061af5f44e6090831f1b2724196828b8 commit 5bb96dab061af5f44e6090831f1b2724196828b8 Author: Lexi Winter AuthorDate: 2025-09-23 22:34:03 +0000 Commit: Lexi Winter CommitDate: 2025-09-24 09:16:13 +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 --- 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"])