Page MenuHomeFreeBSD
Differential D34141

stand: Fix kboot issue on powerpc64 with MK_LIB32=yes
ClosedPublic
Actions

Authored by imp on Feb 2 2022, 7:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Nov 3, 2:13 PM
Unknown Object (File)
Sun, Oct 20, 5:19 PM
Unknown Object (File)
Tue, Oct 15, 7:23 AM
Unknown Object (File)
Oct 6 2024, 9:59 AM
Unknown Object (File)
Sep 16 2024, 4:23 PM
Unknown Object (File)
Sep 16 2024, 11:45 AM
Unknown Object (File)
Sep 10 2024, 11:44 PM
Unknown Object (File)
Sep 4 2024, 10:56 PM
View All 64 Files
Subscribers
brooks
dab

Details

Reviewers
manu
pkubaj
emaste
Commits
rG034755623d3d: stand: Fix kboot issue on powerpc64 with MK_LIB32=yes
Summary

When MK_LIB32 is true, we descend into stand for make includes, make
clean, etc. We shouldn't do this, so set MK_BOOT=no when we're building
includes.

Fixes: 6497250f6f7f
PR: 261497
Sponsored by: Netflix

Diff Detail

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

Event Timeline

imp created this revision.Feb 2 2022, 7:08 PM
Herald added a reviewer: manu. · View Herald TranscriptFeb 2 2022, 7:08 PM
Herald added a subscriber: dab. · View Herald Transcript
imp requested review of this revision.Feb 2 2022, 7:08 PM
Harbormaster completed remote builds in B44245: Diff 102265.Feb 2 2022, 7:08 PM
imp added a reviewer: pkubaj.Feb 2 2022, 7:09 PM
brooks added a subscriber: brooks.Feb 2 2022, 8:47 PM

I wonder if setting MK_BOOT=no in Makefile.libcompat where we set MK_TESTS=no would work and be cleaner?

imp added a comment.Feb 2 2022, 9:06 PM
In D34141#772230, @brooks wrote:

I wonder if setting MK_BOOT=no in Makefile.libcompat where we set MK_TESTS=no would work and be cleaner?

Let's find out. That's the knob I was looking for....

emaste accepted this revision.Feb 2 2022, 9:17 PM
emaste added a subscriber: emaste.

I added a compat32 exclusion in R10:2e85df652caef859c532b7e1e8a178c75f1a4a92 with:

.if !defined(COMPAT_32BIT)
SUBDIR.${MK_OPENSSH}+= libcbor
.endif

But if you've tested this workaround I'm happy enough with it given the comment.

This revision is now accepted and ready to land.Feb 2 2022, 9:17 PM
emaste added a comment.Feb 2 2022, 9:18 PM

@brooks's suggestion sounds good

imp updated this revision to Diff 102278.Feb 2 2022, 9:19 PM
imp removed a reviewer: emaste.
imp removed a subscriber: emaste.

This works.

This revision now requires review to proceed.Feb 2 2022, 9:19 PM
Harbormaster completed remote builds in B44257: Diff 102278.Feb 2 2022, 9:19 PM
imp edited the summary of this revision. (Show Details)Feb 2 2022, 9:20 PM
emaste accepted this revision.Feb 2 2022, 9:24 PM

LGTM but maybe put before MK_CTF in alpha order?

This revision is now accepted and ready to land.Feb 2 2022, 9:24 PM
Closed by commit rG034755623d3d: stand: Fix kboot issue on powerpc64 with MK_LIB32=yes (authored by imp). · Explain WhyFeb 2 2022, 9:29 PM
This revision was automatically updated to reflect the committed changes.
imp added a commit: rG034755623d3d: stand: Fix kboot issue on powerpc64 with MK_LIB32=yes.

Revision Contents
Changeset List

PathSize
3 lines

Diff 102279

View Options

Makefile.libcompat

Loading...