Page MenuHomeFreeBSD
Differential D31324

pkgbase: accommodate pkg < 1.17
ClosedPublic
Actions

Authored by emaste on Jul 27 2021, 6:02 PM.
Tags
None
Referenced Files
F110630442: D31324.id92820.diff
Fri, Feb 21, 4:18 AM
Unknown Object (File)
Tue, Feb 18, 7:12 PM
Unknown Object (File)
Sun, Jan 26, 11:27 PM
Unknown Object (File)
Sun, Jan 26, 11:13 PM
Unknown Object (File)
Sun, Jan 26, 10:59 PM
Unknown Object (File)
Sat, Jan 25, 9:11 PM
Unknown Object (File)
Thu, Jan 23, 4:54 AM
Unknown Object (File)
Jan 12 2025, 10:09 AM
View All 89 Files
Subscribers
imp
lwhsu

Details

Reviewers
bapt
manu
Commits
rG227980df3979: pkgbase: accommodate pkg < 1.17
rG4e224e4be7c3: pkgbase: accommodate pkg < 1.17
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
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste requested review of this revision.Jul 27 2021, 6:02 PM
emaste created this revision.
emaste updated this revision to Diff 92821.Jul 27 2021, 6:04 PM

upload correct diff

emaste added a comment.Jul 27 2021, 6:05 PM

Here is a run with this change: https://cirrus-ci.com/task/6702980729667584

emaste edited the summary of this revision. (Show Details)Jul 27 2021, 6:05 PM
manu added inline comments.Jul 27 2021, 6:19 PM
Makefile.inc1
1860

is this related ?

1882

extra line

emaste added inline comments.Jul 27 2021, 6:38 PM
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.

1882

Removed in my local version now.

manu accepted this revision.Jul 27 2021, 6:46 PM
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
Closed by commit rG4e224e4be7c3: pkgbase: accommodate pkg < 1.17 (authored by emaste). · Explain WhyJul 27 2021, 6:52 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG4e224e4be7c3: pkgbase: accommodate pkg < 1.17.
emaste added a commit: rG227980df3979: pkgbase: accommodate pkg < 1.17.Oct 10 2023, 1:37 PM
Herald added a subscriber: imp. · View Herald TranscriptOct 10 2023, 1:37 PM

Revision Contents
Changeset List

PathSize
15 lines

Diff 92822

View Options

Makefile.inc1

Loading...