Thu Apr 18 15:41:13 2024 UTC (32d)
Pull up following revision(s) (requested by riastradh in ticket #1829):

	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.17.4.1 -r1.17.4.2 src/distrib/evbarm/instkernel/sshramdisk/Makefile

cvs diff -r1.17.4.1 -r1.17.4.2 src/distrib/evbarm/instkernel/sshramdisk/Makefile (expand / switch to context diff)
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile 2019/08/23 04:22:49 1.17.4.1
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile 2024/04/18 15:41:13 1.17.4.2
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17.4.1 2019/08/23 04:22:49 msaitoh Exp $
+#	$NetBSD: Makefile,v 1.17.4.2 2024/04/18 15:41:13 martin Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,9 @@
 		${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