[src/trunk]: src/distrib/evbarm/instkernel/sshramdisk Deal with sshkey_sign. ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7563f49aa64
branches:  trunk
changeset: 969705:c7563f49aa64
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 28 13:00:51 2020 +0000

description:
Deal with sshkey_sign. I am going to fix this properly at some point, but
it needs coordination from upstream (Patrick Welche)

diffstat:

 distrib/evbarm/instkernel/sshramdisk/Makefile |  12 ++++++++++--
 distrib/evbarm/instkernel/sshramdisk/list     |   4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 5db328f91390 -r c7563f49aa64 distrib/evbarm/instkernel/sshramdisk/Makefile
--- a/distrib/evbarm/instkernel/sshramdisk/Makefile     Fri Feb 28 11:27:38 2020 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/Makefile     Fri Feb 28 13:00:51 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.21 2020/01/21 14:58:58 mlelstv Exp $
+#      $NetBSD: Makefile,v 1.22 2020/02/28 13:00:51 christos Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,10 +31,18 @@
                ${DISTRIBDIR}/common/services
 IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
 
+.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
+liboverride.o: ssh-sk-client.o
+       ${_MKTARGET_LINK}
+       ${LD} -r -o ${.TARGET} ${.ALLSRC}
+
+CLEANFILES+=   liboverride.o ssh-sk-client.o
+
+
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=       ${DISTRIBDIR}/utils/libhack
 .include       "${HACKSRC}/Makefile.inc"
-${CRUNCHBIN}:  libhack.o
+${CRUNCHBIN}:  libhack.o liboverride.o
 
 USE_PAM := no
 USE_YP := no
diff -r 5db328f91390 -r c7563f49aa64 distrib/evbarm/instkernel/sshramdisk/list
--- a/distrib/evbarm/instkernel/sshramdisk/list Fri Feb 28 11:27:38 2020 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/list Fri Feb 28 13:00:51 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.2 2019/08/14 12:08:27 martin Exp $
+#      $NetBSD: list,v 1.3 2020/02/28 13:00:51 christos Exp $
 
 SRCDIRS        bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
 
@@ -69,7 +69,7 @@
 SPECIAL sshd           srcdir  crypto/external/bsd/openssh/bin/sshd
 SPECIAL sshd           keepsymbols allow_severity deny_severity
 
-LIBS   libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop    -lssh -lcrypto -lwrap
+LIBS   libhack.o liboverride.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop    -lssh -lcrypto -lwrap
 
 # init invokes the shell as -sh
 ARGVLN sh -sh