Page MenuHomeFreeBSD

release/tools: use pkg settings in /etc/pkg/FreeBSD.conf in containers
AcceptedPublic

Authored by dch on Fri, Dec 5, 5:44 PM.
Tags
None
Referenced Files
F139298094: D54090.diff
Wed, Dec 10, 2:17 PM
Unknown Object (File)
Mon, Dec 8, 11:39 PM
Unknown Object (File)
Mon, Dec 8, 11:38 PM
Unknown Object (File)
Mon, Dec 8, 8:09 PM
Unknown Object (File)
Mon, Dec 8, 7:57 AM
Unknown Object (File)
Sun, Dec 7, 12:17 AM
Subscribers

Details

Reviewers
dfr
Group Reviewers
releng

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 69077
Build 65960: arc lint + arc unit

Event Timeline

dch requested review of this revision.Fri, Dec 5, 5:44 PM

The FreeBSD-base url here needs to have the pkg+: prefix otherwise it doesn't work in our new CDN world. It seems simplest to just enable here, and let /etc/pkg/FreeBSD.conf specify everything else.

I don't know what the correct path for the file should be, but it seems using the same as /etc/pkg/FreeBSD.conf seems the least confusing.

This is what we advise users to do in that file:

# To disable a repository, instead of modifying or removing this file,
# create a /usr/local/etc/pkg/repos/FreeBSD.conf file, e.g.:
#
#   mkdir -p /usr/local/etc/pkg/repos
#   echo "FreeBSD-ports: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
#   echo "FreeBSD-ports-kmods: { enabled: no }" >> /usr/local/etc/pkg/repos/FreeBSD.conf
#
# Note that the FreeBSD-base repository is disabled by default.
...

i'm not familiar enough with the OCI build to review this, but the change looks right: we shouldn't be duplicating information that's already in /etc/pkg/FreeBSD.conf. this would also fix downstream users (like me) who ship a modified FreeBSD.conf.

Looks good to me, thanks Dave!

This revision is now accepted and ready to land.Tue, Dec 9, 4:05 PM