Page MenuHomeFreeBSD

avoid installing if_wg.h twice
ClosedPublic

Authored by emaste on May 9 2023, 10:56 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 19, 4:43 AM
Unknown Object (File)
Fri, Apr 19, 4:43 AM
Unknown Object (File)
Fri, Apr 19, 4:43 AM
Unknown Object (File)
Fri, Apr 19, 4:28 AM
Unknown Object (File)
Mon, Apr 15, 1:17 PM
Unknown Object (File)
Sun, Apr 14, 5:30 PM
Unknown Object (File)
Mon, Apr 8, 1:59 PM
Unknown Object (File)
Dec 20 2023, 7:10 AM
Subscribers
None

Details

Summary

if_wg.h was installed via dev/wg in LSUBDIRS and also explicitly.

Diff Detail

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

Event Timeline

emaste created this revision.
emaste added inline comments.
include/Makefile
53

full set of wg includes via LSUBDIRS:

./usr/include/dev/wg/compat.h type=file uname=root gname=wheel mode=0444 size=351 tags=package=runtime,dev
./usr/include/dev/wg/crypto.h type=file uname=root gname=wheel mode=0444 size=3234 tags=package=runtime,dev
./usr/include/dev/wg/if_wg.h type=file uname=root gname=wheel mode=0444 size=1167 tags=package=runtime,dev
./usr/include/dev/wg/version.h type=file uname=root gname=wheel mode=0444 size=35 tags=package=runtime,dev
./usr/include/dev/wg/wg_cookie.h type=file uname=root gname=wheel mode=0444 size=2192 tags=package=runtime,dev
./usr/include/dev/wg/wg_noise.h type=file uname=root gname=wheel mode=0444 size=4188 tags=package=runtime,dev

Yeah, I don't see any reason to prefer the separate INCSGROUP over LSUBDIRS, this seems sane.

This revision is now accepted and ready to land.May 10 2023, 12:20 AM
include/Makefile
360

OTOH, we probably just need to add it to this list here and in the symlinks target to limit it to just the one header we need for userladn.

strip dev/wg from LSUBDIRS in the copies and symlinks targets instead

This revision now requires review to proceed.May 10 2023, 12:36 AM
This revision is now accepted and ready to land.May 10 2023, 12:41 AM
This revision was automatically updated to reflect the committed changes.

Yes, the intention was to only install the one header needed for userland, not all of them.