release: Install pkg from the pkgbase repo
ClosedPublic
Actions

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

Details

Reviewers

cperciva
ifreund_freebsdfoundation.org

Commits

rGd500f1f015e3: release: Install pkg from the pkgbase repo
rGaba986215fc9: release: Install pkg from the pkgbase repo

Summary

If we're building pkgbase media, install the pkg package from the
pkgbase repository we already created, not from pkg.freebsd.org.
Aside from being more desirable, this also fixes make release for
version/architecture combinations which are missing repository
on pkg.f.o (which is nearly all of them at the time of writing).

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:34 AM

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

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

Harbormaster completed remote builds in B67191: Diff 162455.Sat, Sep 20, 2:34 AM

ivy added a parent revision: D52636: pkgbase-stage.lua: Add pkg package to the offline repo.Sat, Sep 20, 2:35 AM

ivy added a child revision: D52638: release: Improve kernel package handling.Sat, Sep 20, 2:40 AM

Other than one nit, this LGTM!

release/Makefile
250	It's a bit awkward that we need to bypass `PKG_INSTALL` to override the repo dir with -R, especially since its duplicated 3 times. I think I'd prefer to to have `PKGBASE_INSTALL` alternative to `PKG_INSTALL` so that these 3 instances can't get out of sync at least.