Module Name: src
Committed By: martin
Date: Thu Apr 18 15:40:17 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk [netbsd-10]: Makefile
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.6.1 \
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.25.6.1
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.25 Thu Mar 26 07:44:43 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Thu Apr 18 15:40:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/03/26 07:44:43 skrll Exp $
+# $NetBSD: Makefile,v 1.25.6.1 2024/04/18 15:40:16 martin Exp $
.include <bsd.own.mk>
.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
