The branch main has been updated by cperciva:

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

commit b9afd7f6a5b1cf1a6cbcef7a55aede7e71a0babc
Author:     Colin Percival <cperc...@freebsd.org>
AuthorDate: 2025-09-15 02:44:07 +0000
Commit:     Colin Percival <cperc...@freebsd.org>
CommitDate: 2025-09-18 04:40:43 +0000

    release: Allow powerpc GENERIC64(le)? kernels
    
    The pkgbase-stage.lua script asserts that it has exactly one "kernel",
    but only accepts GENERIC as a "kernel".  Use a slightly more permissive
    regex in order to capture kernels with names which start "GENERIC".
    
    Reviwed by:     ivy
    MFC after:      12 hours
    Sponsored by:   https://www.patreon.com/cperciva
    Differential Revision:  https://reviews.freebsd.org/D52544
---
 release/scripts/pkgbase-stage.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/release/scripts/pkgbase-stage.lua 
b/release/scripts/pkgbase-stage.lua
index a12ec372d1a9..0cd4cbb5c438 100755
--- a/release/scripts/pkgbase-stage.lua
+++ b/release/scripts/pkgbase-stage.lua
@@ -50,10 +50,12 @@ local function select_packages(pkg, media, all_libcompats)
                        package ~= "FreeBSD-kernel-man"
                then
                        -- Kernels other than FreeBSD-kernel-generic are ignored
-                       if package == "FreeBSD-kernel-generic" then
-                               table.insert(components["kernel"], package)
-                       elseif package == "FreeBSD-kernel-generic-dbg" then
+                       -- Note that on powerpc64 and powerpc64le the names are
+                       -- slightly different.
+                       if package:match("^FreeBSD%-kernel%-generic.*%-dbg") 
then
                                table.insert(components["kernel_dbg"], package)
+                       elseif package:match("^FreeBSD%-kernel%-generic.*") then
+                               table.insert(components["kernel"], package)
                        end
                elseif package:match(".*%-dbg$") then
                        table.insert(components["base_dbg"], package)

Reply via email to