Page MenuHomeFreeBSD

pkgbase: accommodate pkg < 1.17
ClosedPublic

Authored by emaste on Jul 27 2021, 6:02 PM.

Details

Summary

R10:6cafdee71d2b23e8ec95d1f128b0e11f103491bb adapted pkgbase build for 1.17, but broke Cirrus-CI's use of PKG_FORMAT=tar as quarterly pkg set still uses pkg 1.16. As a result Cirrus-CI pkg and test was disabled in R10:2bfba2a04b05524d72a6190164aa5aaa1d29e337.

Check pkg --version and use the old logic for < 1.17. To be reverted once we no longer encounter pkg 1.16 in cloud images.

Diff Detail

Repository
R10 FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

emaste created this revision.
Makefile.inc1
1860

is this related ?

1881

extra line

Makefile.inc1
1860

Yes because we use PKG_BIN_VERSION in sign-packages below. I could split PKG_BIN_VERSION out into a separate section to avoid an unnecessary shell invocation for PKG_ABI but it doesn't seem worth much. I would like to revert this entire change once we won't encounter 1.16 anymore.

1881

Removed in my local version now.

manu added inline comments.
Makefile.inc1
1860

Ah right, I've missed that.

This revision is now accepted and ready to land.Jul 27 2021, 6:46 PM
This revision was automatically updated to reflect the committed changes.