Page MenuHomeFreeBSD
Differential D26193

Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import
ClosedPublic
Actions

Authored by arichardson on Aug 26 2020, 11:33 AM.
Tags
None
Referenced Files
F103233852: D26193.diff
Fri, Nov 22, 11:52 AM
Unknown Object (File)
Oct 23 2024, 4:20 PM
Unknown Object (File)
Oct 23 2024, 10:31 AM
Unknown Object (File)
Oct 11 2024, 1:10 AM
Unknown Object (File)
Oct 11 2024, 1:10 AM
Unknown Object (File)
Oct 10 2024, 10:11 PM
Unknown Object (File)
Oct 1 2024, 5:02 AM
Unknown Object (File)
Sep 30 2024, 4:25 PM
View All 75 Files
Subscribers
delphij
imp
mahrens

Details

Reviewers
mmacy
freqlabs
Group Reviewers
ZFS
Commits
rS365901: Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import
Summary

This modifies one of the contrib headers but I can't see a better solution.

Test Plan

compiles again after this change on Ubuntu and macOS

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 33169
Build 30518: arc lint + arc unit

Event Timeline

arichardson created this revision.Aug 26 2020, 11:33 AM
Herald added a subscriber: delphij. · View Herald TranscriptAug 26 2020, 11:33 AM
arichardson requested review of this revision.Aug 26 2020, 11:33 AM
Harbormaster completed remote builds in B33169: Diff 76242.Aug 26 2020, 11:33 AM
mahrens added a subscriber: mahrens.Aug 26 2020, 3:47 PM

Could we change the contrib files upstream (OpenZFS), rather than maintaining the diffs?

arichardson added a comment.Aug 26 2020, 3:48 PM
In D26193#582057, @mahrens wrote:

Could we change the contrib files upstream (OpenZFS), rather than maintaining the diffs?

Yeah that would be ideal, just checking if the FreeBSD zfs developers are fine with this ugly change.

freqlabs accepted this revision.Aug 26 2020, 7:15 PM

Looks reasonably noninvasive. I'm surprised it's that easy :)

This revision is now accepted and ready to land.Aug 26 2020, 7:15 PM
arichardson added a comment.Sep 9 2020, 2:00 PM

The contrib changes were upstream in https://github.com/openzfs/zfs/pull/10863. Is it safe to commit this now or will it cause any issues with the next import (it's exactly the same diff)?

arichardson added a comment.Sep 17 2020, 11:13 AM

ping? Are you planning to update the openzfs code soon or is it okay to commit this?

Closed by commit rS365901: Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import (authored by arichardson). · Explain WhySep 19 2020, 12:08 PM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rS365901: Fix dtrace tools bootstrap on non-FreeBSD after OpenZFS import.
Herald added a subscriber: imp. · View Herald TranscriptSep 19 2020, 12:08 PM
GitHub <noreply@github.com> mentioned this in rGf3064162ba41: Fixes for running FreeBSD buildworld on Linux/macOS hosts.Jun 8 2021, 2:50 PM

Revision Contents
Changeset List

PathSize
cddl/
lib/
libspl/
6 lines
sys/
contrib/
openzfs/
include/
os/
freebsd/
spl/
sys/
5 lines
lib/
libspl/
include/
os/
freebsd/
sys/
3 lines
tools/
build/
cross-build/
include/
common/
4 lines
sys/
8 lines
linux/
sys/
3 lines
mac/
sys/
2 lines
mk/
1 line

Diff 76242

View Options

cddl/lib/libspl/Makefile

Loading...
View Options

sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h

Loading...
View Options

sys/contrib/openzfs/lib/libspl/include/os/freebsd/sys/stat.h

Loading...
View Options

tools/build/cross-build/include/common/string.h

Loading...
View Options

tools/build/cross-build/include/common/sys/cdefs.h

Loading...
View Options

tools/build/cross-build/include/common/sys/uio.h

Loading...
View Options

tools/build/cross-build/include/linux/sys/stat.h

Loading...
View Options

tools/build/cross-build/include/mac/sys/_types.h

Loading...
View Options

tools/build/mk/Makefile.boot

Loading...