release: Improve kernel package handling
ClosedPublic
Actions

Authored by ivy on Sat, Sep 20, 2:40 AM.

Details

Reviewers

cperciva
ifreund_freebsdfoundation.org

Commits

rGb1187b5a1274: release: Improve kernel package handling
rG3f5385beeacf: release: Improve kernel package handling

Summary

Although support for PowerPC kernels (GENERIC64 and GENERIC64LE) was
added to pkgbase-stage.lua, the equivalent support was missing from
bsdinstall, so the installer would fail at runtime since it wouldn't
find a kernel package.

Improve the pkgbase-stage logic to have a specific list of kernels
we want to support (which avoids breaking if multiple kernels are
available), and use the same logic in both bsdinstall and pkgbase-stage.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 67192
Build 64075: arc lint + arc unit

Event Timeline

ivy created this revision.Sat, Sep 20, 2:40 AM

Herald added subscribers: jrtc27, imp. · View Herald TranscriptSat, Sep 20, 2:40 AM

ivy requested review of this revision.Sat, Sep 20, 2:40 AM

Harbormaster completed remote builds in B67192: Diff 162456.Sat, Sep 20, 2:40 AM

ivy added a parent revision: D52637: release: Install pkg from the pkgbase repo.Sat, Sep 20, 2:40 AM

ivy added a reviewer: ifreund_freebsdfoundation.org.

ivy added a child revision: D52639: bsdinstall: Install pkg if it's available.Sat, Sep 20, 3:06 AM

I see one minor improvement that can be made to the code style, the change itself LGTM!

release/scripts/pkgbase-stage.lua
41	This whole condition could be simply `if kernel_packages[package:match("(.*)%-dbg$")] then ...` since `foo[nil]` is always `nil` in lua. This would take us from 3 separate things that can get out of sync with each other (`-4`, `"-dbg"`, and `1, -5`) to a single thing. The same goes for the duplicate code in pkgbase.in.

cperciva accepted this revision.Tue, Sep 23, 8:21 PM

cperciva added inline comments.

release/scripts/pkgbase-stage.lua
41	Maybe this is just me being inexperienced with lua speaking, but I prefer the way Lexi wrote this simply because it's immediately clear what it means without needing to understand exactly what `:match(glob)` produces as output.