The branch main has been updated by ivy:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=5bb96dab061af5f44e6090831f1b2724196828b8

commit 5bb96dab061af5f44e6090831f1b2724196828b8
Author:     Lexi Winter <[email protected]>
AuthorDate: 2025-09-23 22:34:03 +0000
Commit:     Lexi Winter <[email protected]>
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"])

Reply via email to