Thu Apr 18 15:40:17 2024 UTC (21d)
Pull up following revision(s) (requested by riastradh in ticket #657):

	distrib/evbarm/instkernel/sshramdisk/Makefile: revision 1.26

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


(martin)
diff -r1.25 -r1.25.6.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs diff -r1.25 -r1.25.6.1 src/distrib/evbarm/instkernel/sshramdisk/Makefile (expand / switch to unified diff)

--- src/distrib/evbarm/instkernel/sshramdisk/Makefile 2020/03/26 07:44:43 1.25
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile 2024/04/18 15:40:16 1.25.6.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2020/03/26 07:44:43 skrll Exp $ 1# $NetBSD: Makefile,v 1.25.6.1 2024/04/18 15:40:16 martin Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 4.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
5 5
6IMAGE= sshramdisk.fs 6IMAGE= sshramdisk.fs
7IMAGESIZE= 45000k 7IMAGESIZE= 45000k
8MAKEFS_FLAGS+= -f 15 8MAKEFS_FLAGS+= -f 15
9 9
10.if ${MKREPRO_TIMESTAMP:Uno} != "no" 10.if ${MKREPRO_TIMESTAMP:Uno} != "no"
11MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}" 11MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
12PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}" 12PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
13.endif 13.endif
14 14
@@ -19,27 +19,29 @@ CRUNCHBIN= ramdiskbin @@ -19,27 +19,29 @@ CRUNCHBIN= ramdiskbin
19LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst 19LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
20MTREECONF= ${.CURDIR}/mtree.conf 20MTREECONF= ${.CURDIR}/mtree.conf
21.if empty(MACHINE_ARCH:M*eb) 21.if empty(MACHINE_ARCH:M*eb)
22IMAGEENDIAN= le 22IMAGEENDIAN= le
23.else 23.else
24IMAGEENDIAN= be 24IMAGEENDIAN= be
25.endif 25.endif
26MAKEDEVTARGETS= ramdisk 26MAKEDEVTARGETS= ramdisk
27IMAGEDEPENDS= ${CRUNCHBIN} \ 27IMAGEDEPENDS= ${CRUNCHBIN} \
28 dot.profile master.passwd sshd_config ssh_host_rsa_key \ 28 dot.profile master.passwd sshd_config ssh_host_rsa_key \
29 ${NETBSDSRCDIR}/etc/group \ 29 ${NETBSDSRCDIR}/etc/group \
30 ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ 30 ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
31 ${DISTRIBDIR}/common/services 31 ${DISTRIBDIR}/common/services
32IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR} 32IMAGEPREBUILD= \
 33 (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
 34 | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
33 35
34# Use stubs to eliminate some large stuff from libc 36# Use stubs to eliminate some large stuff from libc
35HACKSRC= ${DISTRIBDIR}/utils/libhack 37HACKSRC= ${DISTRIBDIR}/utils/libhack
36.include "${HACKSRC}/Makefile.inc" 38.include "${HACKSRC}/Makefile.inc"
37${CRUNCHBIN}: libhack.o 39${CRUNCHBIN}: libhack.o
38 40
39USE_PAM := no 41USE_PAM := no
40USE_YP := no 42USE_YP := no
41USE_SKEY := no 43USE_SKEY := no
42USE_KERBEROS := no 44USE_KERBEROS := no
43USE_LDAP := no 45USE_LDAP := no
44.export USE_PAM 46.export USE_PAM
45.export USE_YP 47.export USE_YP