Module Name: src
Committed By: christos
Date: Fri May 17 21:31:10 UTC 2024
Modified Files:
src/distrib/common: Makefile.image
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
use IMAGESPECEXTRA to include libdata and don't include IMAGERUNTIME
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.image
cvs rdiff -u -r1.27 -r1.28 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/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.43 src/distrib/common/Makefile.image:1.44
--- src/distrib/common/Makefile.image:1.43 Fri May 17 15:54:28 2024
+++ src/distrib/common/Makefile.image Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.43 2024/05/17 19:54:28 christos Exp $
+# $NetBSD: Makefile.image,v 1.44 2024/05/17 21:31:10 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -107,8 +107,7 @@ ${IMAGE}: ${WORKBUILT}
${IMAGEPREBUILD}
.endif
if [ "X${IMAGERUNTIME}" != "X" ]; then \
- release_destdir=${WORKDIR}; \
- cd $$release_destdir; \
+ release_destdir=${CUROBJDIR}/${WORKDIR}; \
cd ${DESTDIR}; \
for imge in ${IMAGERUNTIME}; \
do \
@@ -117,7 +116,7 @@ ${IMAGE}: ${WORKBUILT}
done; \
cd "${CUROBJDIR}"; \
fi
- for i in ${IMAGERUNTIME} ${IMAGESPECEXTRA}; do \
+ for i in ${IMAGESPECEXTRA}; do \
if [ -n "$$i" ] && [ -e ${WORKDIR}/$$i ]; then \
${MAKESPEC} -d ${WORKDIR} $$i >> ${WORKSPEC}; \
fi; \
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.28
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.27 Fri May 17 16:26:48 2024
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri May 17 17:31:10 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2024/05/17 20:26:48 christos Exp $
+# $NetBSD: Makefile,v 1.28 2024/05/17 21:31:10 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,6 +30,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
IMAGERUNTIME= libdata/firmware
+IMAGESPECEXTRA= libdata
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
