Page MenuHomeFreeBSD
Differential D34249

Makefile.inc1: add fallback to set PKG_ABI from newvers.sh
ClosedPublic
Actions

Authored by emaste on Feb 11 2022, 2:31 PM.
Tags
None
Referenced Files
F166361757: D34249.id102658.diff
Thu, Aug 13, 3:35 AM
Unknown Object (File)
Fri, Aug 7, 10:20 AM
Unknown Object (File)
Fri, Aug 7, 2:05 AM
Unknown Object (File)
Thu, Aug 6, 2:29 PM
Unknown Object (File)
Thu, Aug 6, 2:28 PM
Unknown Object (File)
Wed, Aug 5, 2:59 AM
Unknown Object (File)
Mon, Jul 27, 3:29 AM
Unknown Object (File)
Jun 9 2026, 6:18 PM
View All Files
Subscribers
imp

Details

Reviewers
manu
kevans
Commits
rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables
Summary

If ${WSTAGEDIR}/usr/bin/uname does not exist (e.g., if building only kernel packages) we were unable to determine PKG_ABI. In this case synthesize it from newvers.sh.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste requested review of this revision.Feb 11 2022, 2:31 PM
emaste created this revision.
emaste added a reviewer: kevans.
manu accepted this revision.Feb 11 2022, 2:34 PM

LGTM

This revision is now accepted and ready to land.Feb 11 2022, 2:34 PM
emaste updated this revision to Diff 102661.Feb 11 2022, 2:52 PM

always use newvers.sh mode

This revision now requires review to proceed.Feb 11 2022, 2:52 PM
manu accepted this revision.Feb 11 2022, 2:54 PM
This revision is now accepted and ready to land.Feb 11 2022, 2:54 PM
kevans accepted this revision.Feb 11 2022, 3:48 PM
Closed by commit rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables (authored by emaste). · Explain WhyFeb 11 2022, 5:01 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGea9a92d21007: Makefile.inc1: synthesize PKG_ABI from newvers.sh variables.
Herald added a subscriber: imp. · View Herald TranscriptFeb 11 2022, 5:01 PM
imp added inline comments.Feb 11 2022, 5:28 PM
Makefile.inc1
527

This shouldn't do this. It should do eval $(newvers.sh -V ${_V}) instead. These aren't guaranteed to be constants.
A note for another day...

emaste mentioned this in D34253: newvers.sh: allow multiple -V args in one invocation.Feb 11 2022, 5:58 PM
emaste added inline comments.
Makefile.inc1
527

Indeed. I submitted D34253 as one tiny step related to this

1888

We could perhaps drop the uname case and always use newvers.sh

1888

Oops this was an unsubmitted draft comment. I discussed on IRC and updated to include this.

Revision Contents
Changeset List

PathSize
8 lines

Diff 102672

View Options

Makefile.inc1

Loading...