Page MenuHomeFreeBSD
Differential D36135

makefs: Fix issues building as a cross-tool on non-FreeBSD
ClosedPublic
Actions

Authored by jrtc27 on Aug 11 2022, 12:03 AM.
Tags
None
Referenced Files
F132512738: D36135.id109501.diff
Fri, Oct 17, 1:28 PM
F132467244: D36135.id.diff
Fri, Oct 17, 4:28 AM
F132467241: D36135.id109141.diff
Fri, Oct 17, 4:28 AM
F132421114: D36135.diff
Thu, Oct 16, 7:17 PM
Unknown Object (File)
Wed, Oct 15, 8:55 PM
Unknown Object (File)
Sep 1 2025, 10:32 PM
Unknown Object (File)
Aug 14 2025, 11:56 PM
Unknown Object (File)
Aug 14 2025, 9:36 AM
View All 93 Files
Subscribers
arichardson
delphij
imp

Details

Reviewers
markj
Commits
rGc6890399fc00: makefs: Fix issues building as a cross-tool on non-FreeBSD
Summary

This adds missing includes, uses the standard dirent.h rather than the
BSD-specific sys/dirent.h subset (which works on macOS but not Linux)
and works around Linux's lack of st_birthtim.

This allows usr.sbin/makefs to be added to LOCAL_XTOOL_DIRS again on
macOS and Linux so that disk images can be cross-built.

Fixes: 240afd8c1fcc ("makefs: Add ZFS support")

Diff Detail

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

Event Timeline

jrtc27 created this revision.Aug 11 2022, 12:03 AM
Herald added subscribers: delphij, imp. · View Herald TranscriptAug 11 2022, 12:03 AM
jrtc27 requested review of this revision.Aug 11 2022, 12:03 AM
Harbormaster completed remote builds in B46852: Diff 109141.Aug 11 2022, 12:03 AM
jrtc27 added parent revisions: D36134: tools/build: Provide fls* when cross-building on Linux, D36133: tools/build: Provide FreeBSD's bitstring API when cross-building, D36131: makefs: Fix 32-bit issues in ZFS time attributes setting.Aug 11 2022, 12:04 AM
markj accepted this revision.Aug 11 2022, 12:34 AM
This revision is now accepted and ready to land.Aug 11 2022, 12:34 AM
arichardson added a subscriber: arichardson.Aug 11 2022, 10:23 PM

Oh nice, didn't see these changes, I just went for the simple workaround in D36089

arichardson mentioned this in D36089: usr.sbin/makefs: Disable ZFS support when bootstrapping on non-FreeBSD.Aug 11 2022, 10:23 PM
Closed by commit rGc6890399fc00: makefs: Fix issues building as a cross-tool on non-FreeBSD (authored by jrtc27). · Explain WhyAug 18 2022, 1:47 AM
This revision was automatically updated to reflect the committed changes.
jrtc27 added a commit: rGc6890399fc00: makefs: Fix issues building as a cross-tool on non-FreeBSD.

Revision Contents
Changeset List

PathSize
usr.sbin/
makefs/
zfs/
1 line
8 lines
1 line
1 line
1 line
1 line

Diff 109501

View Options

usr.sbin/makefs/zfs/dsl.c

Loading...
View Options

usr.sbin/makefs/zfs/fs.c

Loading...
View Options

usr.sbin/makefs/zfs/objset.c

Loading...
View Options

usr.sbin/makefs/zfs/vdev.c

Loading...
View Options

usr.sbin/makefs/zfs/zap.c

Loading...
View Options

usr.sbin/makefs/zfs/zfs.h

Loading...