Allow override of the pkg command used for 'make packages'
ClosedPublic
Actions

Authored by matthew on Oct 2 2016, 9:01 AM.

Details

Reviewers

brd
gjb
bapt

Commits

rS310181: Revert r309339, thus re-instating r309314
rS309314: Allow a user-overridable setting 'PKG_CMD' to control the command used

Summary

Allow a user-overridable setting 'PKG_CMD' to control the command used
to create a repo during 'make packages'

This would have been useful for a situation I found myself in where
pkg(8) had been upgraded to a version that wanted the FBSD_1.5 ABI
version but libc.so.7 had not been upgraded, and only provided
FBSD_1.4. I found I needed to update libc in order to run pkg, and I
also needed to use pkg to update libc... Which is why pkg-static
exists, but there's currently no way to tell the build system to use
pkg-static instead of pkg.

This creates a variable PKG_CMD, default value 'pkg', that can be
overridden from the command line.

Test Plan

# cd /usr/src
# make packages

# make PKG_CMD=/usr/local/sbin/pkg-static packages

(making sure that nothing is still using 'pkg' when the override is in place)

# cp /usr/local/sbin/{pkg,pkg-dynamic}
# cat /dev/null > /usr/local/sbin/pkg
# make PKG_CMD=/usr/local/sbin/pkg-dynamic packages

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 5394
Build 5593: CI src build	Jenkins
Build 5592: arc lint + arc unit

Event Timeline

matthew updated this revision to Diff 20927.Oct 2 2016, 9:01 AM

matthew retitled this revision from to Allow override of the pkg command used for 'make packages'.

matthew updated this object.

matthew edited the test plan for this revision. (Show Details)

matthew added reviewers: brd, gjb, bapt.

Herald added subscribers: emaste, imp, bdrewery. · View Herald TranscriptOct 2 2016, 9:01 AM

matthew edited the test plan for this revision. (Show Details)Oct 2 2016, 9:17 AM

matthew updated this object.Oct 2 2016, 9:21 AM

gjb accepted this revision.Nov 28 2016, 7:49 PM

gjb edited edge metadata.

This revision is now accepted and ready to land.Nov 28 2016, 7:49 PM

Closed by commit rS309314: Allow a user-overridable setting 'PKG_CMD' to control the command used (authored by matthew). · Explain WhyNov 30 2016, 7:16 AM

This revision was automatically updated to reflect the committed changes.

Can this be reverted for now as this breaks installing ports?

In D8120#179936, @antoine wrote:

Can this be reverted for now as this breaks installing ports?

Done.

Matthew, I have a different idea how to do this. I'll do some testing.

If bapt's suggestion in D8677 is applied then this should no longer be a problem.

Otherwise, shifting the definition of $PKG_CMD out of bsd.own.mk should fix things.

In D8120#179990, @matthew wrote:

If bapt's suggestion in D8677 is applied then this should no longer be a problem.

If it does, please feel free to re-commit the change.

Otherwise, shifting the definition of $PKG_CMD out of bsd.own.mk should fix things.

This is the direction I was going to go.

Given the rename of PKG_CMD to PKG_REGISTER in D8677 was committed by swills in r427523 about two weeks ago, can we try again with this?

This revision is now accepted and ready to land.Dec 16 2016, 1:49 PM

In D8120#182506, @matthew wrote:

Given the rename of PKG_CMD to PKG_REGISTER in D8677 was committed by swills in r427523 about two weeks ago, can we try again with this?

Yes, please go ahead. Please revert my change that undid your original commit with 'svn merge -c -rNNNNNN /path/to/head' so the merge history is not broken.

In D8120#182580, @gjb wrote:

In D8120#182506, @matthew wrote:

Given the rename of PKG_CMD to PKG_REGISTER in D8677 was committed by swills in r427523 about two weeks ago, can we try again with this?

Yes, please go ahead. Please revert my change that undid your original commit with 'svn merge -c -rNNNNNN /path/to/head' so the merge history is not broken.