freebsd/freebsd-src
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-11-07 04:36:52 -10:00
Code Issues Packages Projects Releases Wiki Activity

Only build secure/libexec/ssh-sk-helper if MK_USB == no

Browse Source 
The ssh-sk-helper utility only functions if/when MK_USB == yes.
Installing it on systems where MK_USB == no doesn't make sense.

Differential Revision:	https://reviews.freebsd.org/D58246

(cherry picked from commit 4db3872aab)
This commit is contained in:
Enji Cooper committed 2026-10-31 22:05:30 -07:00
1 parent ae33c4c7b4
commit 509d1a936c
3 files changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

secure/libexec/Makefile
+3 -1
View File
@@ -3,8 +3,10 @@
SUBDIR=
.if ${MK_OPENSSH} != "no"
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper ssh-sk-helper sshd-session
SUBDIR+=sftp-server ssh-keysign ssh-pkcs11-helper sshd-session
SUBDIR+=sshd-auth
SUBDIR.${MK_USB}+= ssh-sk-helper
.endif
SUBDIR.${MK_TESTS}+= tests
secure/libexec/ssh-sk-helper/Makefile
+1 -4
View File
@@ -6,10 +6,7 @@ SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c
MAN= ssh-sk-helper.8
CFLAGS+=-I${SRCTOP}/contrib/libfido2/src
LIBADD= ssh crypto z
.if ${MK_USB} != "no"
LIBADD+= fido2 cbor
.endif
LIBADD= ssh crypto z fido2 cbor
.include <bsd.prog.mk>
tools/build/mk/OptionalObsoleteFiles.inc
+2
View File
@@ -8898,6 +8898,7 @@ OLD_FILES+=usr/lib/libusbhid_p.a
OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
OLD_FILES+=usr/libexec/ssh-sk-helper
OLD_FILES+=usr/sbin/uathload
OLD_FILES+=usr/sbin/uhsoctl
OLD_FILES+=usr/sbin/usbconfig
@@ -9172,6 +9173,7 @@ OLD_FILES+=usr/share/man/man4/uslcom.4.gz
OLD_FILES+=usr/share/man/man4/uvisor.4.gz
OLD_FILES+=usr/share/man/man4/uvscom.4.gz
OLD_FILES+=usr/share/man/man4/zyd.4.gz
OLD_FILES+=usr/share/man/man8/ssh-sk-helper.8.gz
OLD_FILES+=usr/share/man/man8/uathload.8.gz
OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
OLD_FILES+=usr/share/man/man8/usbdump.8.gz