pkgbase-stage.lua: Add pkg package to the offline repo
ClosedPublic
Actions

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

Details

Reviewers

cperciva
ifreund_freebsdfoundation.org
emaste

Commits

rG3608d730ad33: pkgbase-stage.lua: Add pkg package to the offline repo
rG5bb96dab061a: pkgbase-stage.lua: Add pkg package to the offline repo

Summary

We need a pkg package on the media so we can install it for offline
installations; copy this packages from the staging repository to
the pkgbase offline repository on the media.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

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

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

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

Harbormaster completed remote builds in B67190: Diff 162454.Sat, Sep 20, 2:33 AM

ivy added a parent revision: D52635: release: Fail the build if pkg can't be installed.Sat, Sep 20, 2:34 AM

ivy added reviewers: ifreund_freebsdfoundation.org, emaste.

ivy added a child revision: D52637: release: Install pkg from the pkgbase repo.

ifreund_freebsdfoundation.org accepted this revision.Tue, Sep 23, 1:17 PM

This revision is now accepted and ready to land.Tue, Sep 23, 1:17 PM

Thank you! I completely forgot about pkgbase-stage.lua when I was doing the package-pkg dance.

cperciva added inline comments.Tue, Sep 23, 8:23 PM

release/scripts/pkgbase-stage.lua
42	On second glance, do we want to omit this to support the case of building without /usr/ports ?

ivy added inline comments.Tue, Sep 23, 8:28 PM

release/scripts/pkgbase-stage.lua
42	that means you'll end up with an installer that doesn't contain pkg(8), which seems reasonable for `bootonly` but probably wrong for `disc1`. i don't mind removing this assert for now and we can work that out later.

cperciva added inline comments.Tue, Sep 23, 8:33 PM

release/scripts/pkgbase-stage.lua
42	Yeah, for Official Release Building it should be safe to assert we have /usr/ports but I'm not absolutely sure about it for other users of `make release`. I mean, there's a reason you made it optional in D52639.

ivy added inline comments.Tue, Sep 23, 8:37 PM

release/scripts/pkgbase-stage.lua
42	D52639 was more about jails, i.e. you need to be able to build src (only) and then use it to `bsdinstall jail /myjail`, in which case you won't have a pkg package. for release media i think it's more reasonable to just require pkg, since without it the media is not fully functional and we're all agreed that we'll put it in src for 16.0. i don't really have a strong opinion either way here, but i'd like to avoid the situation where we actually build media that doesn't work properly (as in D52635).

cperciva added inline comments.Tue, Sep 23, 8:43 PM

release/scripts/pkgbase-stage.lua
42	Ah right, I was forgetting that people use bsdinstall for jails. I only ever use it for installing from release media. Yeah never mind then, what you have here is good.