Module Name: src
Committed By: christos
Date: Fri Feb 28 13:00:51 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile list
Log Message:
Deal with sshkey_sign. I am going to fix this properly at some point, but
it needs coordination from upstream (Patrick Welche)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbarm/instkernel/sshramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.21 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.22
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.21 Tue Jan 21 09:58:58 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Feb 28 08:00:51 2020
@@ -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 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${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
Index: src/distrib/evbarm/instkernel/sshramdisk/list
diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.2 src/distrib/evbarm/instkernel/sshramdisk/list:1.3
--- src/distrib/evbarm/instkernel/sshramdisk/list:1.2 Wed Aug 14 08:08:27 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/list Fri Feb 28 08:00:51 2020
@@ -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 umount srcdir distrib/utils/x_u
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
