CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: christos
Date: Fri May 17 20:26:48 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
use IMAGERUNTIME to copy extra data instead of random pax commands
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26 Thu Mar 14 22:20:58 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri May 17 16:26:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/03/15 02:20:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,9 +29,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= \
- (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
- | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
+IMAGERUNTIME= libdata/firmware
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: christos Date: Fri May 17 20:26:48 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: use IMAGERUNTIME to copy extra data instead of random pax commands To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: riastradh
Date: Fri Mar 15 02:20:59 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
evbarm/instkernel/sshramdisk: Put firmware in the right paths.
Maybe this should also be wired up to `release' to put the ramdisk in
the releasedir so we detect destdir path leakage like this had.
PR port-evbarm/58035
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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.25 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.25 Thu Mar 26 07:44:43 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Mar 15 02:20:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/03/26 07:44:43 skrll Exp $
+# $NetBSD: Makefile,v 1.26 2024/03/15 02:20:58 riastradh Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= \
+ (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
+ | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: riastradh Date: Fri Mar 15 02:20:59 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: evbarm/instkernel/sshramdisk: Put firmware in the right paths. Maybe this should also be wired up to `release' to put the ramdisk in the releasedir so we detect destdir path leakage like this had. PR port-evbarm/58035 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: martin Date: Thu Nov 21 13:01:51 UTC 2019 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: Bump image size for gcc8 To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Thu Nov 21 13:01:51 UTC 2019
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
Bump image size for gcc8
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/evbarm/instkernel/sshramdisk/Makefile
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.18 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.19
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.18 Wed Aug 14 12:08:27 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Thu Nov 21 13:01:51 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2019/08/14 12:08:27 martin Exp $
+# $NetBSD: Makefile,v 1.19 2019/11/21 13:01:51 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= sshramdisk.fs
-IMAGESIZE= 28000k
+IMAGESIZE= 3k
MAKEFS_FLAGS+= -f 15
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: martin Date: Wed Aug 14 12:08:27 UTC 2019 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile list sshd_config Added Files: src/distrib/evbarm/instkernel/sshramdisk: ssh_host_rsa_key Removed Files: src/distrib/evbarm/instkernel/sshramdisk: ssh_host_dsa_key Log Message: Update to newer sshd (the host key is the same as before, it already was a rsa key). From Harold Gutch. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/evbarm/instkernel/sshramdisk/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/instkernel/sshramdisk/list \ src/distrib/evbarm/instkernel/sshramdisk/sshd_config cvs rdiff -u -r1.1 -r0 \ src/distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key cvs rdiff -u -r0 -r1.1 \ src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: martin
Date: Wed Aug 14 12:08:27 UTC 2019
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile list sshd_config
Added Files:
src/distrib/evbarm/instkernel/sshramdisk: ssh_host_rsa_key
Removed Files:
src/distrib/evbarm/instkernel/sshramdisk: ssh_host_dsa_key
Log Message:
Update to newer sshd (the host key is the same as before, it already
was a rsa key). From Harold Gutch.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/instkernel/sshramdisk/list \
src/distrib/evbarm/instkernel/sshramdisk/sshd_config
cvs rdiff -u -r1.1 -r0 \
src/distrib/evbarm/instkernel/sshramdisk/ssh_host_dsa_key
cvs rdiff -u -r0 -r1.1 \
src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
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.17 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.18
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.17 Sun Apr 8 15:48:39 2018
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Wed Aug 14 12:08:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/04/08 15:48:39 mlelstv Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/14 12:08:27 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,7 @@ IMAGEENDIAN= be
.endif
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
- dot.profile master.passwd sshd_config ssh_host_dsa_key \
+ dot.profile master.passwd sshd_config ssh_host_rsa_key \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
Index: src/distrib/evbarm/instkernel/sshramdisk/list
diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.1 src/distrib/evbarm/instkernel/sshramdisk/list:1.2
--- src/distrib/evbarm/instkernel/sshramdisk/list:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/sshramdisk/list Wed Aug 14 12:08:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: list,v 1.2 2019/08/14 12:08:27 martin Exp $
SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
@@ -88,4 +88,4 @@ COPY ${DISTRIBDIR}/common/services etc/
COPY ${CURDIR}/dot.profile .profile
COPY ${CURDIR}/inst.profile inst/.profile
COPY ${CURDIR}/sshd_config etc/ssh/sshd_config
-COPY ${CURDIR}/ssh_host_dsa_key etc/ssh/ssh_host_dsa_key 600
+COPY ${CURDIR}/ssh_host_rsa_key etc/ssh/ssh_host_rsa_key 600
Index: src/distrib/evbarm/instkernel/sshramdisk/sshd_config
diff -u src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.1 src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.2
--- src/distrib/evbarm/instkernel/sshramdisk/sshd_config:1.1 Tue Mar 19 22:16:53 2013
+++ src/distrib/evbarm/instkernel/sshramdisk/sshd_config Wed Aug 14 12:08:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: sshd_config,v 1.1 2013/03/19 22:16:53 garbled Exp $
+# $NetBSD: sshd_config,v 1.2 2019/08/14 12:08:27 martin Exp $
# Special cut-down sshd_config for sshramdisk
# Tim Rightnour
@@ -8,7 +8,7 @@
#ListenAddress 0.0.0.0
#ListenAddress ::
#Protocol 2
-#HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_rsa_key
LoginGraceTime 600
# needed because sysinst is uid 0
PermitRootLogin yes
@@ -16,5 +16,4 @@ AuthorizedKeysFile .ssh/authorized_keys
PasswordAuthentication yes
# just in case
PermitEmptyPasswords yes
-UsePrivilegeSeparation sandbox
AllowUsers pi sysinst
Added files:
Index: src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key
diff -u /dev/null src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key:1.1
--- /dev/null Wed Aug 14 12:08:27 2019
+++ src/distrib/evbarm/instkernel/sshramdisk/ssh_host_rsa_key Wed Aug 14 12:08:27 2019
@@ -0,0 +1,27 @@
+-BEGIN RSA PRIVATE KEY-
+MIIEogIBAAKCAQEA2O4DZIR5YH7ESnvKmdTfJbPDzDZt44chEe27eFf28AhnfGYW
+962xKQbzzZqmMsH19CUAxpQ1UJ/o9MPULCZvYDwhn6t0cT3oNaIhj774Nw5Uni99
+d0DV/PSPsZlk22MySEsXI5rygnUg0ZMEQbw3pPlRYb8pjUwbkgsxR6KCDanFMhuK
+DtCTKbtK/y06BpievoFpENGpwwamfbpQxjK0MvT1TU744eKfBcWPtBl2KZM0cnbS
+vxNAvkSQrku2Sb56JzBo7b1TlxeDjBwHmdoFbUWjmXV5YsNkNdXvx52cro5o+z1f
+obpul8qpy+WQOsucRbltzfcBSRQ7lA09D4Hg5QIDAQABAoIBADQsOmCog9CzbF5F
+m5qX2ftlWsf4p0E7tLZtKNNuxJNCUjFXFFsJSTyG0Yg3k5VNlOvdImygJJp5ezuz
+BYqAy/SnQab3Q5AgxYJwtgWudmA3cB6DaXeO/mhSIWUjcWBaYTOF69DCaWT66qO8
+6h8tN2zUEcCii0nSbicXzghei0zhgE6RwwD0k07msQIgVX5XERUZSqQVg+Ls+VAu
+wp1OBW6HeXgSTGuRkzH9UuEobklf+KBtdSj+Nr+NdCg2gh4dNY86u6TT9dLwMw8T
+h8/oqfdnxlXiU4AfBsxWbHdAiqKBSa5IG2+4IsX4Zt3lKjygpRndNzqetfgjsz69
+ebbyjQECgYEA/GgDqx7k6QWOibKKb8DjdGfy+HdGqU5Bm9hSuhFHIwm0zSy+QbfV
+Z5nj1zj2pnm1/yfPKMrMEnZWuDTxMkgDQLv4UPdbWPvbBcowZWfy5st/bDOWtq9E
+SuHci941pNN9kqHDmDk9HPoHcYXmk4mA4W10lSGIHoxH3uCrbBeKj8UCgYEA3ASx
+GdmciAKOAt6g
Re: CVS commit: src/distrib/evbarm/instkernel/sshramdisk
In article <20170318170705.23bb0f...@cvs.netbsd.org>, Sevan Janiyan wrote: >-=-=-=-=-=- > >Module Name: src >Committed By: sevan >Date: Sat Mar 18 17:07:05 UTC 2017 > >Modified Files: > src/distrib/evbarm/instkernel/sshramdisk: Makefile > >Log Message: >Bump image size to unbreak builds. >nbmakefs: `work' size of 21610496 is larger than the maxsize of 2048. > >ok jakllsch That's the easy fix; since this is a significant bump, did anyone bother to figure out what changed? christos
