release: Allow powerpc GENERIC64(le)? kernels
ClosedPublic
Actions

Authored by cperciva on Mon, Sep 15, 4:47 AM.

Details

Reviewers

ifreund_freebsdfoundation.org
ivy

Group Reviewers

releng

Commits

rGb9afd7f6a5b1: release: Allow powerpc GENERIC64(le)? kernels

Summary

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".

MFC after: 3 days
Sponsored by: https://www.patreon.com/cperciva

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

cperciva created this revision.Mon, Sep 15, 4:47 AM

Herald added subscribers: jrtc27, imp. · View Herald TranscriptMon, Sep 15, 4:47 AM

cperciva requested review of this revision.Mon, Sep 15, 4:47 AM

Harbormaster completed remote builds in B67036: Diff 162042.Mon, Sep 15, 4:47 AM

this looks like it will also cause other archs to get the variant GENERIC kernel(s), GENERIC-DEBUG or GENERIC-NODEBUG depending on the release status.

emaste added a reviewer: ifreund_freebsdfoundation.org.Mon, Sep 15, 1:38 PM

In D52544#1199797, @ivy wrote:

this looks like it will also cause other archs to get the variant GENERIC kernel(s), GENERIC-DEBUG or GENERIC-NODEBUG depending on the release status.

I wondered about that, but it looks to me like we're only building one kernel at the moment. There's a assert(#components["kernel"] == 1) which I think will want to change when we start building and shipping more kernels.

In D52544#1199900, @cperciva wrote:

I wondered about that, but it looks to me like we're only building one kernel at the moment. There's a assert(#components["kernel"] == 1) which I think will want to change when we start building and shipping more kernels.

you're right: i thought we built both GENERIC and GENERIC-DEBUG for release but it looks like we only build GENERIC. we should build GENERIC-DEBUG so pkgbase users can easily install it if needed, but that's a separate issue.

that said, i wouldn't object to constraining the pattern slightly to only match GENERIC[0-9A-Z]+, or however you write that in Lua, just to support users who do custom builds with multiple kernels.

This revision is now accepted and ready to land.Mon, Sep 15, 4:44 PM

Is there a reason to limit this at all? If we’re restricting the set of kernels built already then should we not just pick up any and all kernel packages that release/Makefile got Makefile.inc1 to package?

In D52544#1199930, @jrtc27 wrote:

Is there a reason to limit this at all? If we’re restricting the set of kernels built already then should we not just pick up any and all kernel packages that release/Makefile got Makefile.inc1 to package?

no, because this means users like me who build many kernels in the pkgbase repo would get all of those kernels installed on every system, which is not right. until we have a proper kernel selection dialogue, this needs to be restricted to GENERIC (or whatever GENERIC is called on the target arch).

Closed by commit rGb9afd7f6a5b1: release: Allow powerpc GENERIC64(le)? kernels (authored by cperciva). · Explain WhyThu, Sep 18, 4:42 AM

This revision was automatically updated to reflect the committed changes.

cperciva added a commit: rGb9afd7f6a5b1: release: Allow powerpc GENERIC64(le)? kernels.