Makefile.inc1: Unify pkg ABI handling for pkgbase targets
ClosedPublic
Actions

Authored by markj on Aug 13 2024, 11:22 PM.

Details

Reviewers

manu

Group Reviewers

pkgbase

Commits

rGaab2c431064b: pkgbase: Unify pkg ABI handling for pkgbase targets
rGb118b6eb4cb7: pkgbase: Unify pkg ABI handling for pkgbase targets

Summary

Right now, to get the pkg ABI we either use PKG_ABI, derived from
newvers.sh, or use an ABI file from the staged world. This
inconsistency is confusing and can cause problems.

Switch to a single source of truth: use an ABI file from the worldstage
dir to get the ABI of pkgbase packages. In particular, we do not need
to know the ABI until staging is done. More specifically:

use a shell command to define PKG_ABI,
replace inline uses of ABI_FILE,
run sign-packages in a subshell (this was already done for the update-packages target) so that the staging targets are done before we try to evaluate the ABI.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

markj created this revision.Aug 13 2024, 11:22 PM

Herald added subscribers: emaste, imp. · View Herald TranscriptAug 13 2024, 11:22 PM

markj requested review of this revision.Aug 13 2024, 11:22 PM

Harbormaster completed remote builds in B59009: Diff 142062.Aug 13 2024, 11:22 PM

markj added a parent revision: D46286: build.7: Document the packages target.Aug 13 2024, 11:22 PM

markj added a child revision: D46288: Makefile.inc1: Let source packages be built in parallel.

Mhm, that would mean that we need to buildworld before make create-kernel-packages which I think isn't needed right now as I used that in the past to dev only on kernel part. Could we use another file if uname isn't built yet ?

In D46287#1055704, @manu wrote:

Mhm, that would mean that we need to buildworld before make create-kernel-packages which I think isn't needed right now as I used that in the past to dev only on kernel part. Could we use another file if uname isn't built yet ?

I'm not sure which file we could use. The kernel won't have an ABI note, so that doesn't work. kernel-toolchain outputs are compiled for the host system, not the target.

I thought packages and update-packages were the only top-level targets. And I'm not sure how your workflow worked before, there were uses of -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname in the create-kernel-packages target above.

Makefile.inc1
2309	Aren't we assuming here that worldstage is already populated?

In D46287#1055758, @markj wrote:

In D46287#1055704, @manu wrote:

Mhm, that would mean that we need to buildworld before make create-kernel-packages which I think isn't needed right now as I used that in the past to dev only on kernel part. Could we use another file if uname isn't built yet ?

I'm not sure which file we could use. The kernel won't have an ABI note, so that doesn't work. kernel-toolchain outputs are compiled for the host system, not the target.

I thought packages and update-packages were the only top-level targets. And I'm not sure how your workflow worked before, there were uses of -o ABI_FILE=${WSTAGEDIR}/usr/bin/uname in the create-kernel-packages target above.